FM / fixes

/usr/lib/python2.6/lib2to3/fixes

Name	Size	Mode	Actions
fix_apply.py	1879	0644	edit dl rm
fix_apply.pyc	1852	0644	edit dl rm
fix_apply.pyo	1817	0644	edit dl rm
fix_basestring.py	296	0644	edit dl rm
fix_basestring.pyc	766	0644	edit dl rm
fix_basestring.pyo	766	0644	edit dl rm
fix_buffer.py	566	0644	edit dl rm
fix_buffer.pyc	932	0644	edit dl rm
fix_buffer.pyo	932	0644	edit dl rm
fix_callable.py	1112	0644	edit dl rm
fix_callable.pyc	1440	0644	edit dl rm
fix_callable.pyo	1440	0644	edit dl rm
fix_dict.py	3798	0644	edit dl rm
fix_dict.pyc	3781	0644	edit dl rm
fix_dict.pyo	3657	0644	edit dl rm
fix_except.py	3327	0644	edit dl rm
fix_except.pyc	3040	0644	edit dl rm
fix_except.pyo	3040	0644	edit dl rm
fix_exec.py	977	0644	edit dl rm
fix_exec.pyc	1397	0644	edit dl rm
fix_exec.pyo	1362	0644	edit dl rm
fix_execfile.py	1973	0644	edit dl rm
fix_execfile.pyc	2038	0644	edit dl rm
fix_execfile.pyo	2003	0644	edit dl rm
fix_exitfunc.py	2453	0644	edit dl rm
fix_exitfunc.pyc	2692	0644	edit dl rm
fix_exitfunc.pyo	2692	0644	edit dl rm
fix_filter.py	2082	0644	edit dl rm
fix_filter.pyc	2237	0644	edit dl rm
fix_filter.pyo	2237	0644	edit dl rm
fix_funcattrs.py	619	0644	edit dl rm
fix_funcattrs.pyc	1087	0644	edit dl rm
fix_funcattrs.pyo	1087	0644	edit dl rm
fix_future.py	521	0644	edit dl rm
fix_future.pyc	892	0644	edit dl rm
fix_future.pyo	892	0644	edit dl rm
fix_getcwdu.py	427	0644	edit dl rm
fix_getcwdu.pyc	899	0644	edit dl rm
fix_getcwdu.pyo	899	0644	edit dl rm
fix_has_key.py	3202	0644	edit dl rm
fix_has_key.pyc	3208	0644	edit dl rm
fix_has_key.pyo	3173	0644	edit dl rm
fix_idioms.py	4890	0644	edit dl rm
fix_idioms.pyc	4550	0644	edit dl rm
fix_idioms.pyo	4440	0644	edit dl rm
fix_import.py	3234	0644	edit dl rm
fix_import.pyc	3264	0644	edit dl rm
fix_import.pyo	3264	0644	edit dl rm
fix_imports.py	5641	0644	edit dl rm
fix_imports.pyc	5333	0644	edit dl rm
fix_imports.pyo	5333	0644	edit dl rm
fix_imports2.py	289	0644	edit dl rm
fix_imports2.pyc	630	0644	edit dl rm
fix_imports2.pyo	630	0644	edit dl rm
fix_input.py	685	0644	edit dl rm
fix_input.pyc	1109	0644	edit dl rm
fix_input.pyo	1109	0644	edit dl rm
fix_intern.py	1362	0644	edit dl rm
fix_intern.pyc	1573	0644	edit dl rm
fix_intern.pyo	1573	0644	edit dl rm
fix_isinstance.py	1585	0644	edit dl rm
fix_isinstance.pyc	1826	0644	edit dl rm
fix_isinstance.pyo	1826	0644	edit dl rm
fix_itertools.py	1472	0644	edit dl rm
fix_itertools.pyc	1695	0644	edit dl rm
fix_itertools.pyo	1695	0644	edit dl rm
fix_itertools_imports.py	1840	0644	edit dl rm
fix_itertools_imports.pyc	1856	0644	edit dl rm
fix_itertools_imports.pyo	1809	0644	edit dl rm
fix_long.py	453	0644	edit dl rm
fix_long.pyc	816	0644	edit dl rm
fix_long.pyo	816	0644	edit dl rm
fix_map.py	3037	0644	edit dl rm
fix_map.pyc	3029	0644	edit dl rm
fix_map.pyo	3029	0644	edit dl rm
fix_metaclass.py	8188	0644	edit dl rm
fix_metaclass.pyc	6643	0644	edit dl rm
fix_metaclass.pyo	6591	0644	edit dl rm
fix_methodattrs.py	590	0644	edit dl rm
fix_methodattrs.pyc	1111	0644	edit dl rm
fix_methodattrs.pyo	1111	0644	edit dl rm
fix_ne.py	573	0644	edit dl rm
fix_ne.pyc	993	0644	edit dl rm
fix_ne.pyo	993	0644	edit dl rm
fix_next.py	3156	0644	edit dl rm
fix_next.pyc	3579	0644	edit dl rm
fix_next.pyo	3544	0644	edit dl rm
fix_nonzero.py	573	0644	edit dl rm
fix_nonzero.pyc	1059	0644	edit dl rm
fix_nonzero.pyo	1059	0644	edit dl rm
fix_numliterals.py	773	0644	edit dl rm
fix_numliterals.pyc	1264	0644	edit dl rm
fix_numliterals.pyo	1264	0644	edit dl rm
fix_operator.py	1496	0644	edit dl rm
fix_operator.pyc	1755	0644	edit dl rm
fix_operator.pyo	1755	0644	edit dl rm
fix_paren.py	1202	0644	edit dl rm
fix_paren.pyc	1516	0644	edit dl rm
fix_paren.pyo	1516	0644	edit dl rm
fix_print.py	2839	0644	edit dl rm
fix_print.pyc	2748	0644	edit dl rm
fix_print.pyo	2645	0644	edit dl rm
fix_raise.py	2560	0644	edit dl rm
fix_raise.pyc	2366	0644	edit dl rm
fix_raise.pyo	2366	0644	edit dl rm
fix_raw_input.py	430	0644	edit dl rm
fix_raw_input.pyc	909	0644	edit dl rm
fix_raw_input.pyo	909	0644	edit dl rm
fix_reduce.py	795	0644	edit dl rm
fix_reduce.pyc	1209	0644	edit dl rm
fix_reduce.pyo	1209	0644	edit dl rm
fix_renames.py	2193	0644	edit dl rm
fix_renames.pyc	2437	0644	edit dl rm
fix_renames.pyo	2437	0644	edit dl rm
fix_repr.py	589	0644	edit dl rm
fix_repr.pyc	991	0644	edit dl rm
fix_repr.pyo	991	0644	edit dl rm
fix_set_literal.py	1674	0644	edit dl rm
fix_set_literal.pyc	1978	0644	edit dl rm
fix_set_literal.pyo	1978	0644	edit dl rm
fix_standarderror.py	426	0644	edit dl rm
fix_standarderror.pyc	826	0644	edit dl rm
fix_standarderror.pyo	826	0644	edit dl rm
fix_sys_exc.py	1014	0644	edit dl rm
fix_sys_exc.pyc	1682	0644	edit dl rm
fix_sys_exc.pyo	1682	0644	edit dl rm
fix_throw.py	1562	0644	edit dl rm
fix_throw.pyc	1994	0644	edit dl rm
fix_throw.pyo	1994	0644	edit dl rm
fix_tuple_params.py	5456	0644	edit dl rm
fix_tuple_params.pyc	5467	0644	edit dl rm
fix_tuple_params.pyo	5467	0644	edit dl rm
fix_types.py	1782	0644	edit dl rm
fix_types.pyc	2177	0644	edit dl rm
fix_types.pyo	2177	0644	edit dl rm
fix_unicode.py	696	0644	edit dl rm
fix_unicode.pyc	1164	0644	edit dl rm
fix_unicode.pyo	1164	0644	edit dl rm
fix_urllib.py	7510	0644	edit dl rm
fix_urllib.pyc	6451	0644	edit dl rm
fix_urllib.pyo	6451	0644	edit dl rm
fix_ws_comma.py	1095	0644	edit dl rm
fix_ws_comma.pyc	1401	0644	edit dl rm
fix_ws_comma.pyo	1401	0644	edit dl rm
fix_xrange.py	2675	0644	edit dl rm
fix_xrange.pyc	3052	0644	edit dl rm
fix_xrange.pyo	3052	0644	edit dl rm
fix_xreadlines.py	665	0644	edit dl rm
fix_xreadlines.pyc	1144	0644	edit dl rm
fix_xreadlines.pyo	1144	0644	edit dl rm
fix_zip.py	879	0644	edit dl rm
fix_zip.pyc	1323	0644	edit dl rm
fix_zip.pyo	1323	0644	edit dl rm
__init__.py	47	0644	edit dl rm
__init__.pyc	131	0644	edit dl rm
__init__.pyo	131	0644	edit dl rm

Edit: /usr/lib/python2.6/lib2to3/fixes/fix_except.py (3327B)

"""Fixer for except statements with named exceptions.

The following cases will be converted:

- "except E, T:" where T is a name:

except E as T:

- "except E, T:" where T is not a name, tuple or list:

except E as t:
            T = t

This is done because the target of an "except" clause must be a
    name.

- "except E, T:" where T is a tuple or list literal:

except E as t:
            T = t.args
"""
# Author: Collin Winter

# Local imports
from .. import pytree
from ..pgen2 import token
from .. import fixer_base
from ..fixer_util import Assign, Attr, Name, is_tuple, is_list, syms

def find_excepts(nodes):
    for i, n in enumerate(nodes):
        if n.type == syms.except_clause:
            if n.children[0].value == u'except':
                yield (n, nodes[i+2])

class FixExcept(fixer_base.BaseFix):

PATTERN = """
    try_stmt< 'try' ':' (simple_stmt | suite)
                  cleanup=(except_clause ':' (simple_stmt | suite))+
                  tail=(['except' ':' (simple_stmt | suite)]
                        ['else' ':' (simple_stmt | suite)]
                        ['finally' ':' (simple_stmt | suite)]) >
    """

def transform(self, node, results):
        syms = self.syms

tail = [n.clone() for n in results["tail"]]

try_cleanup = [ch.clone() for ch in results["cleanup"]]
        for except_clause, e_suite in find_excepts(try_cleanup):
            if len(except_clause.children) == 4:
                (E, comma, N) = except_clause.children[1:4]
                comma.replace(Name(u"as", prefix=u" "))

if N.type != token.NAME:
                    # Generate a new N for the except clause
                    new_N = Name(self.new_name(), prefix=u" ")
                    target = N.clone()
                    target.prefix = u""
                    N.replace(new_N)
                    new_N = new_N.clone()

# Insert "old_N = new_N" as the first statement in
                    #  the except body. This loop skips leading whitespace
                    #  and indents
                    #TODO(cwinter) suite-cleanup
                    suite_stmts = e_suite.children
                    for i, stmt in enumerate(suite_stmts):
                        if isinstance(stmt, pytree.Node):
                            break

# The assignment is different if old_N is a tuple or list
                    # In that case, the assignment is old_N = new_N.args
                    if is_tuple(N) or is_list(N):
                        assign = Assign(target, Attr(new_N, Name(u'args')))
                    else:
                        assign = Assign(target, new_N)

#TODO(cwinter) stopgap until children becomes a smart list
                    for child in reversed(suite_stmts[:i]):
                        e_suite.insert_child(0, child)
                    e_suite.insert_child(i, assign)
                elif N.prefix == u"":
                    # No space after a comma is legal; no space after "as",
                    # not so much.
                    N.prefix = u" "

#TODO(cwinter) fix this when children becomes a smart list
        children = [c.clone() for c in node.children[:3]] + try_cleanup + tail
        return pytree.Node(node.type, children)

cmd: