/usr/lib/python2.6/lib2to3/fixes
NameSizeModeActions
fix_apply.py18790644editdlrm
fix_apply.pyc18520644editdlrm
fix_apply.pyo18170644editdlrm
fix_basestring.py2960644editdlrm
fix_basestring.pyc7660644editdlrm
fix_basestring.pyo7660644editdlrm
fix_buffer.py5660644editdlrm
fix_buffer.pyc9320644editdlrm
fix_buffer.pyo9320644editdlrm
fix_callable.py11120644editdlrm
fix_callable.pyc14400644editdlrm
fix_callable.pyo14400644editdlrm
fix_dict.py37980644editdlrm
fix_dict.pyc37810644editdlrm
fix_dict.pyo36570644editdlrm
fix_except.py33270644editdlrm
fix_except.pyc30400644editdlrm
fix_except.pyo30400644editdlrm
fix_exec.py9770644editdlrm
fix_exec.pyc13970644editdlrm
fix_exec.pyo13620644editdlrm
fix_execfile.py19730644editdlrm
fix_execfile.pyc20380644editdlrm
fix_execfile.pyo20030644editdlrm
fix_exitfunc.py24530644editdlrm
fix_exitfunc.pyc26920644editdlrm
fix_exitfunc.pyo26920644editdlrm
fix_filter.py20820644editdlrm
fix_filter.pyc22370644editdlrm
fix_filter.pyo22370644editdlrm
fix_funcattrs.py6190644editdlrm
fix_funcattrs.pyc10870644editdlrm
fix_funcattrs.pyo10870644editdlrm
fix_future.py5210644editdlrm
fix_future.pyc8920644editdlrm
fix_future.pyo8920644editdlrm
fix_getcwdu.py4270644editdlrm
fix_getcwdu.pyc8990644editdlrm
fix_getcwdu.pyo8990644editdlrm
fix_has_key.py32020644editdlrm
fix_has_key.pyc32080644editdlrm
fix_has_key.pyo31730644editdlrm
fix_idioms.py48900644editdlrm
fix_idioms.pyc45500644editdlrm
fix_idioms.pyo44400644editdlrm
fix_import.py32340644editdlrm
fix_import.pyc32640644editdlrm
fix_import.pyo32640644editdlrm
fix_imports.py56410644editdlrm
fix_imports.pyc53330644editdlrm
fix_imports.pyo53330644editdlrm
fix_imports2.py2890644editdlrm
fix_imports2.pyc6300644editdlrm
fix_imports2.pyo6300644editdlrm
fix_input.py6850644editdlrm
fix_input.pyc11090644editdlrm
fix_input.pyo11090644editdlrm
fix_intern.py13620644editdlrm
fix_intern.pyc15730644editdlrm
fix_intern.pyo15730644editdlrm
fix_isinstance.py15850644editdlrm
fix_isinstance.pyc18260644editdlrm
fix_isinstance.pyo18260644editdlrm
fix_itertools.py14720644editdlrm
fix_itertools.pyc16950644editdlrm
fix_itertools.pyo16950644editdlrm
fix_itertools_imports.py18400644editdlrm
fix_itertools_imports.pyc18560644editdlrm
fix_itertools_imports.pyo18090644editdlrm
fix_long.py4530644editdlrm
fix_long.pyc8160644editdlrm
fix_long.pyo8160644editdlrm
fix_map.py30370644editdlrm
fix_map.pyc30290644editdlrm
fix_map.pyo30290644editdlrm
fix_metaclass.py81880644editdlrm
fix_metaclass.pyc66430644editdlrm
fix_metaclass.pyo65910644editdlrm
fix_methodattrs.py5900644editdlrm
fix_methodattrs.pyc11110644editdlrm
fix_methodattrs.pyo11110644editdlrm
fix_ne.py5730644editdlrm
fix_ne.pyc9930644editdlrm
fix_ne.pyo9930644editdlrm
fix_next.py31560644editdlrm
fix_next.pyc35790644editdlrm
fix_next.pyo35440644editdlrm
fix_nonzero.py5730644editdlrm
fix_nonzero.pyc10590644editdlrm
fix_nonzero.pyo10590644editdlrm
fix_numliterals.py7730644editdlrm
fix_numliterals.pyc12640644editdlrm
fix_numliterals.pyo12640644editdlrm
fix_operator.py14960644editdlrm
fix_operator.pyc17550644editdlrm
fix_operator.pyo17550644editdlrm
fix_paren.py12020644editdlrm
fix_paren.pyc15160644editdlrm
fix_paren.pyo15160644editdlrm
fix_print.py28390644editdlrm
fix_print.pyc27480644editdlrm
fix_print.pyo26450644editdlrm
fix_raise.py25600644editdlrm
fix_raise.pyc23660644editdlrm
fix_raise.pyo23660644editdlrm
fix_raw_input.py4300644editdlrm
fix_raw_input.pyc9090644editdlrm
fix_raw_input.pyo9090644editdlrm
fix_reduce.py7950644editdlrm
fix_reduce.pyc12090644editdlrm
fix_reduce.pyo12090644editdlrm
fix_renames.py21930644editdlrm
fix_renames.pyc24370644editdlrm
fix_renames.pyo24370644editdlrm
fix_repr.py5890644editdlrm
fix_repr.pyc9910644editdlrm
fix_repr.pyo9910644editdlrm
fix_set_literal.py16740644editdlrm
fix_set_literal.pyc19780644editdlrm
fix_set_literal.pyo19780644editdlrm
fix_standarderror.py4260644editdlrm
fix_standarderror.pyc8260644editdlrm
fix_standarderror.pyo8260644editdlrm
fix_sys_exc.py10140644editdlrm
fix_sys_exc.pyc16820644editdlrm
fix_sys_exc.pyo16820644editdlrm
fix_throw.py15620644editdlrm
fix_throw.pyc19940644editdlrm
fix_throw.pyo19940644editdlrm
fix_tuple_params.py54560644editdlrm
fix_tuple_params.pyc54670644editdlrm
fix_tuple_params.pyo54670644editdlrm
fix_types.py17820644editdlrm
fix_types.pyc21770644editdlrm
fix_types.pyo21770644editdlrm
fix_unicode.py6960644editdlrm
fix_unicode.pyc11640644editdlrm
fix_unicode.pyo11640644editdlrm
fix_urllib.py75100644editdlrm
fix_urllib.pyc64510644editdlrm
fix_urllib.pyo64510644editdlrm
fix_ws_comma.py10950644editdlrm
fix_ws_comma.pyc14010644editdlrm
fix_ws_comma.pyo14010644editdlrm
fix_xrange.py26750644editdlrm
fix_xrange.pyc30520644editdlrm
fix_xrange.pyo30520644editdlrm
fix_xreadlines.py6650644editdlrm
fix_xreadlines.pyc11440644editdlrm
fix_xreadlines.pyo11440644editdlrm
fix_zip.py8790644editdlrm
fix_zip.pyc13230644editdlrm
fix_zip.pyo13230644editdlrm
__init__.py470644editdlrm
__init__.pyc1310644editdlrm
__init__.pyo1310644editdlrm
Edit: /usr/lib/python2.6/lib2to3/fixes/fix_tuple_params.py (5456B)
"""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): 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 = u"; " end = pytree.Leaf(token.INDENT, u"") # 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 = u"" stmt = Assign(arg, n.clone()) if add_prefix: n.prefix = u" " 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 = u" " 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 = u" " 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=u" ") 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(unicode(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 u"_".join(l)