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_idioms.py (4890B)

"""Adjust some old Python 2 idioms to their modern counterparts.

* Change some type comparisons to isinstance() calls:
    type(x) == T -> isinstance(x, T)
    type(x) is T -> isinstance(x, T)
    type(x) != T -> not isinstance(x, T)
    type(x) is not T -> not isinstance(x, T)

* Change "while 1:" into "while True:".

* Change both

v = list(EXPR)
    v.sort()
    foo(v)

and the more general

v = EXPR
    v.sort()
    foo(v)

into

v = sorted(EXPR)
    foo(v)
"""
# Author: Jacques Frechet, Collin Winter

# Local imports
from .. import fixer_base
from ..fixer_util import Call, Comma, Name, Node, BlankLine, syms

CMP = "(n='!=' | '==' | 'is' | n=comp_op< 'is' 'not' >)"
TYPE = "power< 'type' trailer< '(' x=any ')' > >"

class FixIdioms(fixer_base.BaseFix):

explicit = True # The user must ask for this fixer

PATTERN = r"""
        isinstance=comparison< %s %s T=any >
        |
        isinstance=comparison< T=any %s %s >
        |
        while_stmt< 'while' while='1' ':' any+ >
        |
        sorted=any<
            any*
            simple_stmt<
              expr_stmt< id1=any '='
                         power< list='list' trailer< '(' (not arglist<any+>) any ')' > >
              >
              '\n'
            >
            sort=
            simple_stmt<
              power< id2=any
                     trailer< '.' 'sort' > trailer< '(' ')' >
              >
              '\n'
            >
            next=any*
        >
        |
        sorted=any<
            any*
            simple_stmt< expr_stmt< id1=any '=' expr=any > '\n' >
            sort=
            simple_stmt<
              power< id2=any
                     trailer< '.' 'sort' > trailer< '(' ')' >
              >
              '\n'
            >
            next=any*
        >
    """ % (TYPE, CMP, CMP, TYPE)

def match(self, node):
        r = super(FixIdioms, self).match(node)
        # If we've matched one of the sort/sorted subpatterns above, we
        # want to reject matches where the initial assignment and the
        # subsequent .sort() call involve different identifiers.
        if r and "sorted" in r:
            if r["id1"] == r["id2"]:
                return r
            return None
        return r

def transform(self, node, results):
        if "isinstance" in results:
            return self.transform_isinstance(node, results)
        elif "while" in results:
            return self.transform_while(node, results)
        elif "sorted" in results:
            return self.transform_sort(node, results)
        else:
            raise RuntimeError("Invalid match")

def transform_isinstance(self, node, results):
        x = results["x"].clone() # The thing inside of type()
        T = results["T"].clone() # The type being compared against
        x.prefix = u""
        T.prefix = u" "
        test = Call(Name(u"isinstance"), [x, Comma(), T])
        if "n" in results:
            test.prefix = u" "
            test = Node(syms.not_test, [Name(u"not"), test])
        test.prefix = node.prefix
        return test

def transform_while(self, node, results):
        one = results["while"]
        one.replace(Name(u"True", prefix=one.prefix))

def transform_sort(self, node, results):
        sort_stmt = results["sort"]
        next_stmt = results["next"]
        list_call = results.get("list")
        simple_expr = results.get("expr")

if list_call:
            list_call.replace(Name(u"sorted", prefix=list_call.prefix))
        elif simple_expr:
            new = simple_expr.clone()
            new.prefix = u""
            simple_expr.replace(Call(Name(u"sorted"), [new],
                                     prefix=simple_expr.prefix))
        else:
            raise RuntimeError("should not have reached here")
        sort_stmt.remove()

btwn = sort_stmt.prefix
        # Keep any prefix lines between the sort_stmt and the list_call and
        # shove them right after the sorted() call.
        if u"\n" in btwn:
            if next_stmt:
                # The new prefix should be everything from the sort_stmt's
                # prefix up to the last newline, then the old prefix after a new
                # line.
                prefix_lines = (btwn.rpartition(u"\n")[0], next_stmt[0].prefix)
                next_stmt[0].prefix = u"\n".join(prefix_lines)
            else:
                assert list_call.parent
                assert list_call.next_sibling is None
                # Put a blank line after list_call and set its prefix.
                end_line = BlankLine()
                list_call.parent.append_child(end_line)
                assert list_call.next_sibling is end_line
                # The new prefix should be everything up to the first new line
                # of sort_stmt's prefix.
                end_line.prefix = btwn.rpartition(u"\n")[0]

cmd: