"""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): BM_compatible = True 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)
Name | Type | Size | Permission | Actions |
---|---|---|---|---|
.__init__.pyo.40009 | File | 133 B | 0644 |
|
.fix_basestring.pyo.40009 | File | 807 B | 0644 |
|
.fix_buffer.pyo.40009 | File | 964 B | 0644 |
|
.fix_callable.pyo.40009 | File | 1.47 KB | 0644 |
|
.fix_except.pyo.40009 | File | 2.94 KB | 0644 |
|
.fix_exitfunc.pyo.40009 | File | 2.69 KB | 0644 |
|
.fix_filter.pyo.40009 | File | 2.22 KB | 0644 |
|
.fix_funcattrs.pyo.40009 | File | 1.1 KB | 0644 |
|
.fix_future.pyo.40009 | File | 933 B | 0644 |
|
.fix_getcwdu.pyo.40009 | File | 940 B | 0644 |
|
.fix_import.pyo.40009 | File | 3.18 KB | 0644 |
|
.fix_imports.pyo.40009 | File | 5.25 KB | 0644 |
|
.fix_imports2.pyo.40009 | File | 634 B | 0644 |
|
.fix_input.pyo.40009 | File | 1.12 KB | 0644 |
|
.fix_intern.pyo.40009 | File | 1.58 KB | 0644 |
|
.fix_isinstance.pyo.40009 | File | 1.81 KB | 0644 |
|
.fix_itertools.pyo.40009 | File | 1.76 KB | 0644 |
|
.fix_long.pyo.40009 | File | 855 B | 0644 |
|
.fix_map.pyo.40009 | File | 2.98 KB | 0644 |
|
.fix_methodattrs.pyo.40009 | File | 1.13 KB | 0644 |
|
.fix_ne.pyo.40009 | File | 1001 B | 0644 |
|
.fix_nonzero.pyo.40009 | File | 1.07 KB | 0644 |
|
.fix_numliterals.pyo.40009 | File | 1.24 KB | 0644 |
|
.fix_operator.pyo.40009 | File | 5.03 KB | 0644 |
|
.fix_paren.pyo.40009 | File | 1.52 KB | 0644 |
|
.fix_raise.pyo.40009 | File | 2.45 KB | 0644 |
|
.fix_raw_input.pyo.40009 | File | 950 B | 0644 |
|
.fix_reduce.pyo.40009 | File | 1.25 KB | 0644 |
|
.fix_renames.pyo.40009 | File | 2.41 KB | 0644 |
|
.fix_repr.pyo.40009 | File | 1.01 KB | 0644 |
|
.fix_set_literal.pyo.40009 | File | 1.96 KB | 0644 |
|
.fix_standarderror.pyo.40009 | File | 867 B | 0644 |
|
.fix_sys_exc.pyo.40009 | File | 1.68 KB | 0644 |
|
.fix_throw.pyo.40009 | File | 1.96 KB | 0644 |
|
.fix_tuple_params.pyo.40009 | File | 5.33 KB | 0644 |
|
.fix_types.pyo.40009 | File | 2.15 KB | 0644 |
|
.fix_unicode.pyo.40009 | File | 1.17 KB | 0644 |
|
.fix_urllib.pyo.40009 | File | 6.99 KB | 0644 |
|
.fix_ws_comma.pyo.40009 | File | 1.36 KB | 0644 |
|
.fix_xrange.pyo.40009 | File | 3.01 KB | 0644 |
|
.fix_xreadlines.pyo.40009 | File | 1.14 KB | 0644 |
|
.fix_zip.pyo.40009 | File | 1.33 KB | 0644 |
|
__init__.py | File | 47 B | 0644 |
|
__init__.pyc | File | 133 B | 0644 |
|
__init__.pyo | File | 133 B | 0644 |
|
fix_apply.py | File | 1.86 KB | 0644 |
|
fix_apply.pyc | File | 1.84 KB | 0644 |
|
fix_apply.pyo | File | 1.81 KB | 0644 |
|
fix_basestring.py | File | 321 B | 0644 |
|
fix_basestring.pyc | File | 807 B | 0644 |
|
fix_basestring.pyo | File | 807 B | 0644 |
|
fix_buffer.py | File | 591 B | 0644 |
|
fix_buffer.pyc | File | 964 B | 0644 |
|
fix_buffer.pyo | File | 964 B | 0644 |
|
fix_callable.py | File | 1.13 KB | 0644 |
|
fix_callable.pyc | File | 1.47 KB | 0644 |
|
fix_callable.pyo | File | 1.47 KB | 0644 |
|
fix_dict.py | File | 3.73 KB | 0644 |
|
fix_dict.pyc | File | 3.68 KB | 0644 |
|
fix_dict.pyo | File | 3.56 KB | 0644 |
|
fix_except.py | File | 3.27 KB | 0644 |
|
fix_except.pyc | File | 2.94 KB | 0644 |
|
fix_except.pyo | File | 2.94 KB | 0644 |
|
fix_exec.py | File | 1002 B | 0644 |
|
fix_exec.pyc | File | 1.4 KB | 0644 |
|
fix_exec.pyo | File | 1.37 KB | 0644 |
|
fix_execfile.py | File | 1.95 KB | 0644 |
|
fix_execfile.pyc | File | 2.02 KB | 0644 |
|
fix_execfile.pyo | File | 1.99 KB | 0644 |
|
fix_exitfunc.py | File | 2.45 KB | 0644 |
|
fix_exitfunc.pyc | File | 2.69 KB | 0644 |
|
fix_exitfunc.pyo | File | 2.69 KB | 0644 |
|
fix_filter.py | File | 2.06 KB | 0644 |
|
fix_filter.pyc | File | 2.22 KB | 0644 |
|
fix_filter.pyo | File | 2.22 KB | 0644 |
|
fix_funcattrs.py | File | 645 B | 0644 |
|
fix_funcattrs.pyc | File | 1.1 KB | 0644 |
|
fix_funcattrs.pyo | File | 1.1 KB | 0644 |
|
fix_future.py | File | 547 B | 0644 |
|
fix_future.pyc | File | 933 B | 0644 |
|
fix_future.pyo | File | 933 B | 0644 |
|
fix_getcwdu.py | File | 452 B | 0644 |
|
fix_getcwdu.pyc | File | 940 B | 0644 |
|
fix_getcwdu.pyo | File | 940 B | 0644 |
|
fix_has_key.py | File | 3.15 KB | 0644 |
|
fix_has_key.pyc | File | 3.12 KB | 0644 |
|
fix_has_key.pyo | File | 3.09 KB | 0644 |
|
fix_idioms.py | File | 4.77 KB | 0644 |
|
fix_idioms.pyc | File | 4.43 KB | 0644 |
|
fix_idioms.pyo | File | 4.33 KB | 0644 |
|
fix_import.py | File | 3.18 KB | 0644 |
|
fix_import.pyc | File | 3.18 KB | 0644 |
|
fix_import.pyo | File | 3.18 KB | 0644 |
|
fix_imports.py | File | 5.56 KB | 0644 |
|
fix_imports.pyc | File | 5.25 KB | 0644 |
|
fix_imports.pyo | File | 5.25 KB | 0644 |
|
fix_imports2.py | File | 289 B | 0644 |
|
fix_imports2.pyc | File | 634 B | 0644 |
|
fix_imports2.pyo | File | 634 B | 0644 |
|
fix_input.py | File | 709 B | 0644 |
|
fix_input.pyc | File | 1.12 KB | 0644 |
|
fix_input.pyo | File | 1.12 KB | 0644 |
|
fix_intern.py | File | 1.37 KB | 0644 |
|
fix_intern.pyc | File | 1.58 KB | 0644 |
|
fix_intern.pyo | File | 1.58 KB | 0644 |
|
fix_isinstance.py | File | 1.57 KB | 0644 |
|
fix_isinstance.pyc | File | 1.81 KB | 0644 |
|
fix_isinstance.pyo | File | 1.81 KB | 0644 |
|
fix_itertools.py | File | 1.51 KB | 0644 |
|
fix_itertools.pyc | File | 1.76 KB | 0644 |
|
fix_itertools.pyo | File | 1.76 KB | 0644 |
|
fix_itertools_imports.py | File | 2.04 KB | 0644 |
|
fix_itertools_imports.pyc | File | 1.98 KB | 0644 |
|
fix_itertools_imports.pyo | File | 1.94 KB | 0644 |
|
fix_long.py | File | 477 B | 0644 |
|
fix_long.pyc | File | 855 B | 0644 |
|
fix_long.pyo | File | 855 B | 0644 |
|
fix_map.py | File | 2.99 KB | 0644 |
|
fix_map.pyc | File | 2.98 KB | 0644 |
|
fix_map.pyo | File | 2.98 KB | 0644 |
|
fix_metaclass.py | File | 8.02 KB | 0644 |
|
fix_metaclass.pyc | File | 6.45 KB | 0644 |
|
fix_metaclass.pyo | File | 6.4 KB | 0644 |
|
fix_methodattrs.py | File | 615 B | 0644 |
|
fix_methodattrs.pyc | File | 1.13 KB | 0644 |
|
fix_methodattrs.pyo | File | 1.13 KB | 0644 |
|
fix_ne.py | File | 573 B | 0644 |
|
fix_ne.pyc | File | 1001 B | 0644 |
|
fix_ne.pyo | File | 1001 B | 0644 |
|
fix_next.py | File | 3.11 KB | 0644 |
|
fix_next.pyc | File | 3.47 KB | 0644 |
|
fix_next.pyo | File | 3.44 KB | 0644 |
|
fix_nonzero.py | File | 598 B | 0644 |
|
fix_nonzero.pyc | File | 1.07 KB | 0644 |
|
fix_nonzero.pyo | File | 1.07 KB | 0644 |
|
fix_numliterals.py | File | 773 B | 0644 |
|
fix_numliterals.pyc | File | 1.24 KB | 0644 |
|
fix_numliterals.pyo | File | 1.24 KB | 0644 |
|
fix_operator.py | File | 3.39 KB | 0644 |
|
fix_operator.pyc | File | 5.03 KB | 0644 |
|
fix_operator.pyo | File | 5.03 KB | 0644 |
|
fix_paren.py | File | 1.2 KB | 0644 |
|
fix_paren.pyc | File | 1.52 KB | 0644 |
|
fix_paren.pyo | File | 1.52 KB | 0644 |
|
fix_print.py | File | 2.8 KB | 0644 |
|
fix_print.pyc | File | 2.68 KB | 0644 |
|
fix_print.pyo | File | 2.58 KB | 0644 |
|
fix_raise.py | File | 2.87 KB | 0644 |
|
fix_raise.pyc | File | 2.45 KB | 0644 |
|
fix_raise.pyo | File | 2.45 KB | 0644 |
|
fix_raw_input.py | File | 455 B | 0644 |
|
fix_raw_input.pyc | File | 950 B | 0644 |
|
fix_raw_input.pyo | File | 950 B | 0644 |
|
fix_reduce.py | File | 839 B | 0644 |
|
fix_reduce.pyc | File | 1.25 KB | 0644 |
|
fix_reduce.pyo | File | 1.25 KB | 0644 |
|
fix_renames.py | File | 2.17 KB | 0644 |
|
fix_renames.pyc | File | 2.41 KB | 0644 |
|
fix_renames.pyo | File | 2.41 KB | 0644 |
|
fix_repr.py | File | 614 B | 0644 |
|
fix_repr.pyc | File | 1.01 KB | 0644 |
|
fix_repr.pyo | File | 1.01 KB | 0644 |
|
fix_set_literal.py | File | 1.66 KB | 0644 |
|
fix_set_literal.pyc | File | 1.96 KB | 0644 |
|
fix_set_literal.pyo | File | 1.96 KB | 0644 |
|
fix_standarderror.py | File | 450 B | 0644 |
|
fix_standarderror.pyc | File | 867 B | 0644 |
|
fix_standarderror.pyo | File | 867 B | 0644 |
|
fix_sys_exc.py | File | 1.01 KB | 0644 |
|
fix_sys_exc.pyc | File | 1.68 KB | 0644 |
|
fix_sys_exc.pyo | File | 1.68 KB | 0644 |
|
fix_throw.py | File | 1.55 KB | 0644 |
|
fix_throw.pyc | File | 1.96 KB | 0644 |
|
fix_throw.pyo | File | 1.96 KB | 0644 |
|
fix_tuple_params.py | File | 5.45 KB | 0644 |
|
fix_tuple_params.pyc | File | 5.33 KB | 0644 |
|
fix_tuple_params.pyo | File | 5.33 KB | 0644 |
|
fix_types.py | File | 1.76 KB | 0644 |
|
fix_types.pyc | File | 2.15 KB | 0644 |
|
fix_types.pyo | File | 2.15 KB | 0644 |
|
fix_unicode.py | File | 720 B | 0644 |
|
fix_unicode.pyc | File | 1.17 KB | 0644 |
|
fix_unicode.pyo | File | 1.17 KB | 0644 |
|
fix_urllib.py | File | 8.19 KB | 0644 |
|
fix_urllib.pyc | File | 6.99 KB | 0644 |
|
fix_urllib.pyo | File | 6.99 KB | 0644 |
|
fix_ws_comma.py | File | 1.07 KB | 0644 |
|
fix_ws_comma.pyc | File | 1.36 KB | 0644 |
|
fix_ws_comma.pyo | File | 1.36 KB | 0644 |
|
fix_xrange.py | File | 2.64 KB | 0644 |
|
fix_xrange.pyc | File | 3.01 KB | 0644 |
|
fix_xrange.pyo | File | 3.01 KB | 0644 |
|
fix_xreadlines.py | File | 690 B | 0644 |
|
fix_xreadlines.pyc | File | 1.14 KB | 0644 |
|
fix_xreadlines.pyo | File | 1.14 KB | 0644 |
|
fix_zip.py | File | 904 B | 0644 |
|
fix_zip.pyc | File | 1.33 KB | 0644 |
|
fix_zip.pyo | File | 1.33 KB | 0644 |
|