mirror of
				https://github.com/python/cpython.git
				synced 2025-11-04 11:49:12 +00:00 
			
		
		
		
	svn+ssh://pythondev@svn.python.org/python/trunk
................
  r64286 | benjamin.peterson | 2008-06-14 21:31:05 -0500 (Sat, 14 Jun 2008) | 49 lines
  Merged revisions 63661,63666,63695,63711,63729,63769,63790,63880,63886 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
  ........
    r63661 | georg.brandl | 2008-05-26 05:26:20 -0500 (Mon, 26 May 2008) | 2 lines
    Add import fixes for dbm package.
  ........
    r63666 | georg.brandl | 2008-05-26 05:49:09 -0500 (Mon, 26 May 2008) | 2 lines
    Add xmlrpc package fixes.
  ........
    r63695 | georg.brandl | 2008-05-26 10:14:33 -0500 (Mon, 26 May 2008) | 2 lines
    Add fixer entries for http package.
  ........
    r63711 | benjamin.peterson | 2008-05-26 13:43:51 -0500 (Mon, 26 May 2008) | 2 lines
    add import mapping for test.test_support -> test.support
  ........
    r63729 | benjamin.peterson | 2008-05-26 16:31:03 -0500 (Mon, 26 May 2008) | 2 lines
    mapping for commands module -> subprocess
  ........
    r63769 | brett.cannon | 2008-05-29 00:13:13 -0500 (Thu, 29 May 2008) | 1 line
    Fixer for UserString.UserString over to the collections module.
  ........
    r63790 | brett.cannon | 2008-05-29 14:13:51 -0500 (Thu, 29 May 2008) | 4 lines
    Add a fixer for UserList.
    Closes issue #2878. Thanks to Quentin Gallet-Gilles for the patch.
  ........
    r63880 | collin.winter | 2008-06-01 18:09:38 -0500 (Sun, 01 Jun 2008) | 6 lines
    Move lib2to3/fixes/{basefix,util}.py down to lib2to3/.
    This is step 1 of turning lib2to3/ into a general-purpose refactoring
    library, reusable by other projects.
  ........
    r63886 | collin.winter | 2008-06-01 22:15:01 -0500 (Sun, 01 Jun 2008) | 5 lines
    Allow refactoring tools to specify a directory for fixer modules.
    This is step 2 of turning lib2to3/ into a general-purpose refactoring
    library, reusable by other projects. Step 1: r63880.
  ........
................
		
	
			
		
			
				
	
	
		
			134 lines
		
	
	
	
		
			3.8 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			134 lines
		
	
	
	
		
			3.8 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
"""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, 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.set_prefix("")
 | 
						|
        T.set_prefix(" ")
 | 
						|
        test = Call(Name("isinstance"), [x, Comma(), T])
 | 
						|
        if "n" in results:
 | 
						|
            test.set_prefix(" ")
 | 
						|
            test = Node(syms.not_test, [Name("not"), test])
 | 
						|
        test.set_prefix(node.get_prefix())
 | 
						|
        return test
 | 
						|
 | 
						|
    def transform_while(self, node, results):
 | 
						|
        one = results["while"]
 | 
						|
        one.replace(Name("True", prefix=one.get_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("sorted", prefix=list_call.get_prefix()))
 | 
						|
        elif simple_expr:
 | 
						|
            new = simple_expr.clone()
 | 
						|
            new.set_prefix("")
 | 
						|
            simple_expr.replace(Call(Name("sorted"), [new],
 | 
						|
                                     prefix=simple_expr.get_prefix()))
 | 
						|
        else:
 | 
						|
            raise RuntimeError("should not have reached here")
 | 
						|
        sort_stmt.remove()
 | 
						|
        if next_stmt:
 | 
						|
            next_stmt[0].set_prefix(sort_stmt.get_prefix())
 |