FM / fixes

/usr/lib64/python2.7/lib2to3/fixes

Name	Size	Mode	Actions
fix_apply.py	2433	0644	edit dl rm
fix_apply.pyc	2084	0644	edit dl rm
fix_apply.pyo	2051	0644	edit dl rm
fix_asserts.py	984	0644	edit dl rm
fix_asserts.pyc	1561	0644	edit dl rm
fix_asserts.pyo	1561	0644	edit dl rm
fix_basestring.py	321	0644	edit dl rm
fix_basestring.pyc	807	0644	edit dl rm
fix_basestring.pyo	807	0644	edit dl rm
fix_buffer.py	591	0644	edit dl rm
fix_buffer.pyc	964	0644	edit dl rm
fix_buffer.pyo	964	0644	edit dl rm
fix_dict.py	3824	0644	edit dl rm
fix_dict.pyc	3769	0644	edit dl rm
fix_dict.pyo	3644	0644	edit dl rm
fix_except.py	3352	0644	edit dl rm
fix_except.pyc	3009	0644	edit dl rm
fix_except.pyo	3009	0644	edit dl rm
fix_exec.py	1002	0644	edit dl rm
fix_exec.pyc	1432	0644	edit dl rm
fix_exec.pyo	1399	0644	edit dl rm
fix_execfile.py	2056	0644	edit dl rm
fix_execfile.pyc	2108	0644	edit dl rm
fix_execfile.pyo	2075	0644	edit dl rm
fix_exitfunc.py	2503	0644	edit dl rm
fix_exitfunc.pyc	2757	0644	edit dl rm
fix_exitfunc.pyo	2757	0644	edit dl rm
fix_filter.py	2107	0644	edit dl rm
fix_filter.pyc	2270	0644	edit dl rm
fix_filter.pyo	2270	0644	edit dl rm
fix_funcattrs.py	645	0644	edit dl rm
fix_funcattrs.pyc	1128	0644	edit dl rm
fix_funcattrs.pyo	1128	0644	edit dl rm
fix_future.py	547	0644	edit dl rm
fix_future.pyc	933	0644	edit dl rm
fix_future.pyo	933	0644	edit dl rm
fix_getcwdu.py	452	0644	edit dl rm
fix_getcwdu.pyc	940	0644	edit dl rm
fix_getcwdu.pyo	940	0644	edit dl rm
fix_has_key.py	3227	0644	edit dl rm
fix_has_key.pyc	3198	0644	edit dl rm
fix_has_key.pyo	3165	0644	edit dl rm
fix_idioms.py	4889	0644	edit dl rm
fix_idioms.pyc	4537	0644	edit dl rm
fix_idioms.pyo	4433	0644	edit dl rm
fix_import.py	3260	0644	edit dl rm
fix_import.pyc	3253	0644	edit dl rm
fix_import.pyo	3253	0644	edit dl rm
fix_imports.py	5693	0644	edit dl rm
fix_imports.pyc	5380	0644	edit dl rm
fix_imports.pyo	5380	0644	edit dl rm
fix_imports2.py	289	0644	edit dl rm
fix_imports2.pyc	634	0644	edit dl rm
fix_imports2.pyo	634	0644	edit dl rm
fix_input.py	710	0644	edit dl rm
fix_input.pyc	1148	0644	edit dl rm
fix_input.pyo	1148	0644	edit dl rm
fix_intern.py	1866	0644	edit dl rm
fix_intern.pyc	1797	0644	edit dl rm
fix_intern.pyo	1797	0644	edit dl rm
fix_isinstance.py	1609	0644	edit dl rm
fix_isinstance.pyc	1852	0644	edit dl rm
fix_isinstance.pyo	1852	0644	edit dl rm
fix_itertools.py	1550	0644	edit dl rm
fix_itertools.pyc	1805	0644	edit dl rm
fix_itertools.pyo	1805	0644	edit dl rm
fix_itertools_imports.py	2094	0644	edit dl rm
fix_itertools_imports.pyc	2030	0644	edit dl rm
fix_itertools_imports.pyo	1985	0644	edit dl rm
fix_long.py	477	0644	edit dl rm
fix_long.pyc	855	0644	edit dl rm
fix_long.pyo	855	0644	edit dl rm
fix_map.py	3062	0644	edit dl rm
fix_map.pyc	3054	0644	edit dl rm
fix_map.pyo	3054	0644	edit dl rm
fix_metaclass.py	8216	0644	edit dl rm
fix_metaclass.pyc	6605	0644	edit dl rm
fix_metaclass.pyo	6555	0644	edit dl rm
fix_methodattrs.py	615	0644	edit dl rm
fix_methodattrs.pyc	1152	0644	edit dl rm
fix_methodattrs.pyo	1152	0644	edit dl rm
fix_ne.py	573	0644	edit dl rm
fix_ne.pyc	1001	0644	edit dl rm
fix_ne.pyo	1001	0644	edit dl rm
fix_next.py	3181	0644	edit dl rm
fix_next.pyc	3555	0644	edit dl rm
fix_next.pyo	3522	0644	edit dl rm
fix_nonzero.py	598	0644	edit dl rm
fix_nonzero.pyc	1100	0644	edit dl rm
fix_nonzero.pyo	1100	0644	edit dl rm
fix_numliterals.py	773	0644	edit dl rm
fix_numliterals.pyc	1265	0644	edit dl rm
fix_numliterals.pyo	1265	0644	edit dl rm
fix_operator.py	3472	0644	edit dl rm
fix_operator.pyc	5150	0644	edit dl rm
fix_operator.pyo	5150	0644	edit dl rm
fix_paren.py	1228	0644	edit dl rm
fix_paren.pyc	1557	0644	edit dl rm
fix_paren.pyo	1557	0644	edit dl rm
fix_print.py	2865	0644	edit dl rm
fix_print.pyc	2743	0644	edit dl rm
fix_print.pyo	2646	0644	edit dl rm
fix_raise.py	2934	0644	edit dl rm
fix_raise.pyc	2512	0644	edit dl rm
fix_raise.pyo	2512	0644	edit dl rm
fix_raw_input.py	455	0644	edit dl rm
fix_raw_input.pyc	950	0644	edit dl rm
fix_raw_input.pyo	950	0644	edit dl rm
fix_reduce.py	839	0644	edit dl rm
fix_reduce.pyc	1276	0644	edit dl rm
fix_reduce.pyo	1276	0644	edit dl rm
fix_renames.py	2218	0644	edit dl rm
fix_renames.pyc	2471	0644	edit dl rm
fix_renames.pyo	2471	0644	edit dl rm
fix_repr.py	614	0644	edit dl rm
fix_repr.pyc	1030	0644	edit dl rm
fix_repr.pyo	1030	0644	edit dl rm
fix_set_literal.py	1699	0644	edit dl rm
fix_set_literal.pyc	2004	0644	edit dl rm
fix_set_literal.pyo	2004	0644	edit dl rm
fix_standarderror.py	450	0644	edit dl rm
fix_standarderror.pyc	867	0644	edit dl rm
fix_standarderror.pyo	867	0644	edit dl rm
fix_sys_exc.py	1039	0644	edit dl rm
fix_sys_exc.pyc	1721	0644	edit dl rm
fix_sys_exc.pyo	1721	0644	edit dl rm
fix_throw.py	1586	0644	edit dl rm
fix_throw.pyc	2010	0644	edit dl rm
fix_throw.pyo	2010	0644	edit dl rm
fix_tuple_params.py	5577	0644	edit dl rm
fix_tuple_params.pyc	5458	0644	edit dl rm
fix_tuple_params.pyo	5458	0644	edit dl rm
fix_types.py	1809	0644	edit dl rm
fix_types.pyc	2210	0644	edit dl rm
fix_types.pyo	2210	0644	edit dl rm
fix_unicode.py	1269	0644	edit dl rm
fix_unicode.pyc	1732	0644	edit dl rm
fix_unicode.pyo	1732	0644	edit dl rm
fix_urllib.py	8385	0644	edit dl rm
fix_urllib.pyc	7160	0644	edit dl rm
fix_urllib.pyo	7160	0644	edit dl rm
fix_ws_comma.py	1095	0644	edit dl rm
fix_ws_comma.pyc	1396	0644	edit dl rm
fix_ws_comma.pyo	1396	0644	edit dl rm
fix_xrange.py	2699	0644	edit dl rm
fix_xrange.pyc	3087	0644	edit dl rm
fix_xrange.pyo	3087	0644	edit dl rm
fix_xreadlines.py	690	0644	edit dl rm
fix_xreadlines.pyc	1166	0644	edit dl rm
fix_xreadlines.pyo	1166	0644	edit dl rm
fix_zip.py	904	0644	edit dl rm
fix_zip.pyc	1360	0644	edit dl rm
fix_zip.pyo	1360	0644	edit dl rm
__init__.py	47	0644	edit dl rm
__init__.pyc	133	0644	edit dl rm
__init__.pyo	133	0644	edit dl rm

Edit: /usr/lib64/python2.7/lib2to3/fixes/fix_tuple_params.py (5577B)

"""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 = 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)

cmd: