FM / fixes

/usr/lib64/python2.6/lib2to3/fixes

Name	Size	Mode	Actions
fix_apply.py	1879	0644	edit dl rm
fix_apply.pyc	1858	0644	edit dl rm
fix_apply.pyo	1823	0644	edit dl rm
fix_basestring.py	296	0644	edit dl rm
fix_basestring.pyc	772	0644	edit dl rm
fix_basestring.pyo	772	0644	edit dl rm
fix_buffer.py	566	0644	edit dl rm
fix_buffer.pyc	938	0644	edit dl rm
fix_buffer.pyo	938	0644	edit dl rm
fix_callable.py	1112	0644	edit dl rm
fix_callable.pyc	1446	0644	edit dl rm
fix_callable.pyo	1446	0644	edit dl rm
fix_dict.py	3798	0644	edit dl rm
fix_dict.pyc	3789	0644	edit dl rm
fix_dict.pyo	3665	0644	edit dl rm
fix_except.py	3327	0644	edit dl rm
fix_except.pyc	3048	0644	edit dl rm
fix_except.pyo	3048	0644	edit dl rm
fix_exec.py	977	0644	edit dl rm
fix_exec.pyc	1403	0644	edit dl rm
fix_exec.pyo	1368	0644	edit dl rm
fix_execfile.py	1973	0644	edit dl rm
fix_execfile.pyc	2044	0644	edit dl rm
fix_execfile.pyo	2009	0644	edit dl rm
fix_exitfunc.py	2453	0644	edit dl rm
fix_exitfunc.pyc	2702	0644	edit dl rm
fix_exitfunc.pyo	2702	0644	edit dl rm
fix_filter.py	2082	0644	edit dl rm
fix_filter.pyc	2243	0644	edit dl rm
fix_filter.pyo	2243	0644	edit dl rm
fix_funcattrs.py	619	0644	edit dl rm
fix_funcattrs.pyc	1093	0644	edit dl rm
fix_funcattrs.pyo	1093	0644	edit dl rm
fix_future.py	521	0644	edit dl rm
fix_future.pyc	898	0644	edit dl rm
fix_future.pyo	898	0644	edit dl rm
fix_getcwdu.py	427	0644	edit dl rm
fix_getcwdu.pyc	905	0644	edit dl rm
fix_getcwdu.pyo	905	0644	edit dl rm
fix_has_key.py	3202	0644	edit dl rm
fix_has_key.pyc	3214	0644	edit dl rm
fix_has_key.pyo	3179	0644	edit dl rm
fix_idioms.py	4890	0644	edit dl rm
fix_idioms.pyc	4564	0644	edit dl rm
fix_idioms.pyo	4454	0644	edit dl rm
fix_import.py	3234	0644	edit dl rm
fix_import.pyc	3276	0644	edit dl rm
fix_import.pyo	3276	0644	edit dl rm
fix_imports.py	5641	0644	edit dl rm
fix_imports.pyc	5353	0644	edit dl rm
fix_imports.pyo	5353	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	685	0644	edit dl rm
fix_input.pyc	1115	0644	edit dl rm
fix_input.pyo	1115	0644	edit dl rm
fix_intern.py	1362	0644	edit dl rm
fix_intern.pyc	1579	0644	edit dl rm
fix_intern.pyo	1579	0644	edit dl rm
fix_isinstance.py	1585	0644	edit dl rm
fix_isinstance.pyc	1832	0644	edit dl rm
fix_isinstance.pyo	1832	0644	edit dl rm
fix_itertools.py	1472	0644	edit dl rm
fix_itertools.pyc	1701	0644	edit dl rm
fix_itertools.pyo	1701	0644	edit dl rm
fix_itertools_imports.py	1840	0644	edit dl rm
fix_itertools_imports.pyc	1862	0644	edit dl rm
fix_itertools_imports.pyo	1815	0644	edit dl rm
fix_long.py	453	0644	edit dl rm
fix_long.pyc	822	0644	edit dl rm
fix_long.pyo	822	0644	edit dl rm
fix_map.py	3037	0644	edit dl rm
fix_map.pyc	3035	0644	edit dl rm
fix_map.pyo	3035	0644	edit dl rm
fix_metaclass.py	8188	0644	edit dl rm
fix_metaclass.pyc	6661	0644	edit dl rm
fix_metaclass.pyo	6609	0644	edit dl rm
fix_methodattrs.py	590	0644	edit dl rm
fix_methodattrs.pyc	1117	0644	edit dl rm
fix_methodattrs.pyo	1117	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	3156	0644	edit dl rm
fix_next.pyc	3595	0644	edit dl rm
fix_next.pyo	3560	0644	edit dl rm
fix_nonzero.py	573	0644	edit dl rm
fix_nonzero.pyc	1065	0644	edit dl rm
fix_nonzero.pyo	1065	0644	edit dl rm
fix_numliterals.py	773	0644	edit dl rm
fix_numliterals.pyc	1272	0644	edit dl rm
fix_numliterals.pyo	1272	0644	edit dl rm
fix_operator.py	1496	0644	edit dl rm
fix_operator.pyc	1761	0644	edit dl rm
fix_operator.pyo	1761	0644	edit dl rm
fix_paren.py	1202	0644	edit dl rm
fix_paren.pyc	1522	0644	edit dl rm
fix_paren.pyo	1522	0644	edit dl rm
fix_print.py	2839	0644	edit dl rm
fix_print.pyc	2756	0644	edit dl rm
fix_print.pyo	2653	0644	edit dl rm
fix_raise.py	2560	0644	edit dl rm
fix_raise.pyc	2372	0644	edit dl rm
fix_raise.pyo	2372	0644	edit dl rm
fix_raw_input.py	430	0644	edit dl rm
fix_raw_input.pyc	915	0644	edit dl rm
fix_raw_input.pyo	915	0644	edit dl rm
fix_reduce.py	795	0644	edit dl rm
fix_reduce.pyc	1215	0644	edit dl rm
fix_reduce.pyo	1215	0644	edit dl rm
fix_renames.py	2193	0644	edit dl rm
fix_renames.pyc	2451	0644	edit dl rm
fix_renames.pyo	2451	0644	edit dl rm
fix_repr.py	589	0644	edit dl rm
fix_repr.pyc	997	0644	edit dl rm
fix_repr.pyo	997	0644	edit dl rm
fix_set_literal.py	1674	0644	edit dl rm
fix_set_literal.pyc	1986	0644	edit dl rm
fix_set_literal.pyo	1986	0644	edit dl rm
fix_standarderror.py	426	0644	edit dl rm
fix_standarderror.pyc	832	0644	edit dl rm
fix_standarderror.pyo	832	0644	edit dl rm
fix_sys_exc.py	1014	0644	edit dl rm
fix_sys_exc.pyc	1690	0644	edit dl rm
fix_sys_exc.pyo	1690	0644	edit dl rm
fix_throw.py	1562	0644	edit dl rm
fix_throw.pyc	2000	0644	edit dl rm
fix_throw.pyo	2000	0644	edit dl rm
fix_tuple_params.py	5456	0644	edit dl rm
fix_tuple_params.pyc	5487	0644	edit dl rm
fix_tuple_params.pyo	5487	0644	edit dl rm
fix_types.py	1782	0644	edit dl rm
fix_types.pyc	2183	0644	edit dl rm
fix_types.pyo	2183	0644	edit dl rm
fix_unicode.py	696	0644	edit dl rm
fix_unicode.pyc	1170	0644	edit dl rm
fix_unicode.pyo	1170	0644	edit dl rm
fix_urllib.py	7510	0644	edit dl rm
fix_urllib.pyc	6467	0644	edit dl rm
fix_urllib.pyo	6467	0644	edit dl rm
fix_ws_comma.py	1095	0644	edit dl rm
fix_ws_comma.pyc	1407	0644	edit dl rm
fix_ws_comma.pyo	1407	0644	edit dl rm
fix_xrange.py	2675	0644	edit dl rm
fix_xrange.pyc	3068	0644	edit dl rm
fix_xrange.pyo	3068	0644	edit dl rm
fix_xreadlines.py	665	0644	edit dl rm
fix_xreadlines.pyc	1150	0644	edit dl rm
fix_xreadlines.pyo	1150	0644	edit dl rm
fix_zip.py	879	0644	edit dl rm
fix_zip.pyc	1329	0644	edit dl rm
fix_zip.pyo	1329	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.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)

cmd: