mirror of
				https://github.com/python/cpython.git
				synced 2025-10-30 21:21:22 +00:00 
			
		
		
		
	 b0871cac11
			
		
	
	
		b0871cac11
		
	
	
	
	
		
			
			svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
  r85510 | benjamin.peterson | 2010-10-14 18:00:04 -0500 (Thu, 14 Oct 2010) | 61 lines
  Merged revisions 83852-83853,83857,84042,84216,84274-84276,84375,85388,85478,85506-85508 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
  ........
    r83852 | benjamin.peterson | 2010-08-08 15:45:44 -0500 (Sun, 08 Aug 2010) | 1 line
    wrap with parens
  ........
    r83853 | benjamin.peterson | 2010-08-08 15:46:31 -0500 (Sun, 08 Aug 2010) | 1 line
    use parens
  ........
    r83857 | benjamin.peterson | 2010-08-08 15:59:49 -0500 (Sun, 08 Aug 2010) | 1 line
    things which use touch_import should be pre order
  ........
    r84042 | george.boutsioukis | 2010-08-14 16:10:19 -0500 (Sat, 14 Aug 2010) | 2 lines
    This revision incorporates into the 2to3 tool the new, faster, tree matching algorithm developed during a GSOC project. The algorithm resides in the two added modules, btm_matcher and btm_utils. New code has been added to drive the new matching process in refactor.py and a few minor changes were made in other modules. A BM_compatible flag(False by default) has been added in fixer_base and it is set to True in most of the current fixers.
  ........
    r84216 | benjamin.peterson | 2010-08-19 16:44:05 -0500 (Thu, 19 Aug 2010) | 1 line
    allow star_expr in testlist_gexp
  ........
    r84274 | benjamin.peterson | 2010-08-22 18:40:46 -0500 (Sun, 22 Aug 2010) | 1 line
    wrap long line
  ........
    r84275 | benjamin.peterson | 2010-08-22 18:42:22 -0500 (Sun, 22 Aug 2010) | 1 line
    cleanup
  ........
    r84276 | benjamin.peterson | 2010-08-22 18:51:01 -0500 (Sun, 22 Aug 2010) | 1 line
    when there's a None value and a traceback, don't call type with it #9661
  ........
    r84375 | george.boutsioukis | 2010-08-31 08:38:53 -0500 (Tue, 31 Aug 2010) | 3 lines
    Idiomatic code changes & stylistic issues fixed in the BottomMatcher module. Thanks to Benjamin Peterson for taking the time to review the code.
  ........
    r85388 | benjamin.peterson | 2010-10-12 17:27:44 -0500 (Tue, 12 Oct 2010) | 1 line
    fix urllib fixer with multiple as imports on a line #10069
  ........
    r85478 | benjamin.peterson | 2010-10-14 08:09:56 -0500 (Thu, 14 Oct 2010) | 1 line
    stop abusing docstrings
  ........
    r85506 | benjamin.peterson | 2010-10-14 17:45:19 -0500 (Thu, 14 Oct 2010) | 1 line
    kill sibling import
  ........
    r85507 | benjamin.peterson | 2010-10-14 17:54:15 -0500 (Thu, 14 Oct 2010) | 1 line
    remove trailing whitespace
  ........
    r85508 | benjamin.peterson | 2010-10-14 17:55:28 -0500 (Thu, 14 Oct 2010) | 1 line
    typo
  ........
................
		
	
			
		
			
				
	
	
		
			175 lines
		
	
	
	
		
			5.4 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			175 lines
		
	
	
	
		
			5.4 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| """Fixer for function definitions with tuple parameters.
 | |
| 
 | |
| def func(((a, b), c), d):
 | |
|     ...
 | |
| 
 | |
|     ->
 | |
| 
 | |
| def func(x, d):
 | |
|     ((a, b), c) = x
 | |
|     ...
 | |
| 
 | |
| It will also support lambdas:
 | |
| 
 | |
|     lambda (x, y): x + y -> lambda t: t[0] + t[1]
 | |
| 
 | |
|     # The parens are a syntax error in Python 3
 | |
|     lambda (x): x + y -> lambda x: x + y
 | |
| """
 | |
| # Author: Collin Winter
 | |
| 
 | |
| # Local imports
 | |
| from .. import pytree
 | |
| from ..pgen2 import token
 | |
| from .. import fixer_base
 | |
| from ..fixer_util import Assign, Name, Newline, Number, Subscript, syms
 | |
| 
 | |
| def is_docstring(stmt):
 | |
|     return isinstance(stmt, pytree.Node) and \
 | |
|            stmt.children[0].type == token.STRING
 | |
| 
 | |
| class FixTupleParams(fixer_base.BaseFix):
 | |
|     run_order = 4 #use a lower order since lambda is part of other
 | |
|                   #patterns
 | |
|     BM_compatible = True
 | |
| 
 | |
|     PATTERN = """
 | |
|               funcdef< 'def' any parameters< '(' args=any ')' >
 | |
|                        ['->' any] ':' suite=any+ >
 | |
|               |
 | |
|               lambda=
 | |
|               lambdef< 'lambda' args=vfpdef< '(' inner=any ')' >
 | |
|                        ':' body=any
 | |
|               >
 | |
|               """
 | |
| 
 | |
|     def transform(self, node, results):
 | |
|         if "lambda" in results:
 | |
|             return self.transform_lambda(node, results)
 | |
| 
 | |
|         new_lines = []
 | |
|         suite = results["suite"]
 | |
|         args = results["args"]
 | |
|         # This crap is so "def foo(...): x = 5; y = 7" is handled correctly.
 | |
|         # TODO(cwinter): suite-cleanup
 | |
|         if suite[0].children[1].type == token.INDENT:
 | |
|             start = 2
 | |
|             indent = suite[0].children[1].value
 | |
|             end = Newline()
 | |
|         else:
 | |
|             start = 0
 | |
|             indent = "; "
 | |
|             end = pytree.Leaf(token.INDENT, "")
 | |
| 
 | |
|         # We need access to self for new_name(), and making this a method
 | |
|         #  doesn't feel right. Closing over self and new_lines makes the
 | |
|         #  code below cleaner.
 | |
|         def handle_tuple(tuple_arg, add_prefix=False):
 | |
|             n = Name(self.new_name())
 | |
|             arg = tuple_arg.clone()
 | |
|             arg.prefix = ""
 | |
|             stmt = Assign(arg, n.clone())
 | |
|             if add_prefix:
 | |
|                 n.prefix = " "
 | |
|             tuple_arg.replace(n)
 | |
|             new_lines.append(pytree.Node(syms.simple_stmt,
 | |
|                                          [stmt, end.clone()]))
 | |
| 
 | |
|         if args.type == syms.tfpdef:
 | |
|             handle_tuple(args)
 | |
|         elif args.type == syms.typedargslist:
 | |
|             for i, arg in enumerate(args.children):
 | |
|                 if arg.type == syms.tfpdef:
 | |
|                     # Without add_prefix, the emitted code is correct,
 | |
|                     #  just ugly.
 | |
|                     handle_tuple(arg, add_prefix=(i > 0))
 | |
| 
 | |
|         if not new_lines:
 | |
|             return
 | |
| 
 | |
|         # This isn't strictly necessary, but it plays nicely with other fixers.
 | |
|         # TODO(cwinter) get rid of this when children becomes a smart list
 | |
|         for line in new_lines:
 | |
|             line.parent = suite[0]
 | |
| 
 | |
|         # TODO(cwinter) suite-cleanup
 | |
|         after = start
 | |
|         if start == 0:
 | |
|             new_lines[0].prefix = " "
 | |
|         elif is_docstring(suite[0].children[start]):
 | |
|             new_lines[0].prefix = indent
 | |
|             after = start + 1
 | |
| 
 | |
|         for line in new_lines:
 | |
|             line.parent = suite[0]
 | |
|         suite[0].children[after:after] = new_lines
 | |
|         for i in range(after+1, after+len(new_lines)+1):
 | |
|             suite[0].children[i].prefix = indent
 | |
|         suite[0].changed()
 | |
| 
 | |
|     def transform_lambda(self, node, results):
 | |
|         args = results["args"]
 | |
|         body = results["body"]
 | |
|         inner = simplify_args(results["inner"])
 | |
| 
 | |
|         # Replace lambda ((((x)))): x  with lambda x: x
 | |
|         if inner.type == token.NAME:
 | |
|             inner = inner.clone()
 | |
|             inner.prefix = " "
 | |
|             args.replace(inner)
 | |
|             return
 | |
| 
 | |
|         params = find_params(args)
 | |
|         to_index = map_to_index(params)
 | |
|         tup_name = self.new_name(tuple_name(params))
 | |
| 
 | |
|         new_param = Name(tup_name, prefix=" ")
 | |
|         args.replace(new_param.clone())
 | |
|         for n in body.post_order():
 | |
|             if n.type == token.NAME and n.value in to_index:
 | |
|                 subscripts = [c.clone() for c in to_index[n.value]]
 | |
|                 new = pytree.Node(syms.power,
 | |
|                                   [new_param.clone()] + subscripts)
 | |
|                 new.prefix = n.prefix
 | |
|                 n.replace(new)
 | |
| 
 | |
| 
 | |
| ### Helper functions for transform_lambda()
 | |
| 
 | |
| def simplify_args(node):
 | |
|     if node.type in (syms.vfplist, token.NAME):
 | |
|         return node
 | |
|     elif node.type == syms.vfpdef:
 | |
|         # These look like vfpdef< '(' x ')' > where x is NAME
 | |
|         # or another vfpdef instance (leading to recursion).
 | |
|         while node.type == syms.vfpdef:
 | |
|             node = node.children[1]
 | |
|         return node
 | |
|     raise RuntimeError("Received unexpected node %s" % node)
 | |
| 
 | |
| def find_params(node):
 | |
|     if node.type == syms.vfpdef:
 | |
|         return find_params(node.children[1])
 | |
|     elif node.type == token.NAME:
 | |
|         return node.value
 | |
|     return [find_params(c) for c in node.children if c.type != token.COMMA]
 | |
| 
 | |
| def map_to_index(param_list, prefix=[], d=None):
 | |
|     if d is None:
 | |
|         d = {}
 | |
|     for i, obj in enumerate(param_list):
 | |
|         trailer = [Subscript(Number(str(i)))]
 | |
|         if isinstance(obj, list):
 | |
|             map_to_index(obj, trailer, d=d)
 | |
|         else:
 | |
|             d[obj] = prefix + trailer
 | |
|     return d
 | |
| 
 | |
| def tuple_name(param_list):
 | |
|     l = []
 | |
|     for obj in param_list:
 | |
|         if isinstance(obj, list):
 | |
|             l.append(tuple_name(obj))
 | |
|         else:
 | |
|             l.append(obj)
 | |
|     return "_".join(l)
 |