"""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]
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 |
|