• Benjamin Peterson's avatar
    Merged revisions 64286 via svnmerge from · df6dc8f1
    Benjamin Peterson yazdı
    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.
      ........
    ................
    df6dc8f1
fix_xrange.py 1.96 KB
# Copyright 2007 Google, Inc. All Rights Reserved.
# Licensed to PSF under a Contributor Agreement.

"""Fixer that changes xrange(...) into range(...)."""

# Local imports
from .. import fixer_base
from ..fixer_util import Name, Call, consuming_calls
from .. import patcomp


class FixXrange(fixer_base.BaseFix):

    PATTERN = """
              power< (name='range'|name='xrange') trailer< '(' [any] ')' > any* >
              """

    def transform(self, node, results):
        name = results["name"]
        if name.value == "xrange":
            return self.transform_xrange(node, results)
        elif name.value == "range":
            return self.transform_range(node, results)
        else:
            raise ValueError(repr(name))

    def transform_xrange(self, node, results):
        name = results["name"]
        name.replace(Name("range", prefix=name.get_prefix()))

    def transform_range(self, node, results):
        if not self.in_special_context(node):
            arg = node.clone()
            arg.set_prefix("")
            call = Call(Name("list"), [arg])
            call.set_prefix(node.get_prefix())
            return call
        return node

    P1 = "power< func=NAME trailer< '(' node=any ')' > any* >"
    p1 = patcomp.compile_pattern(P1)

    P2 = """for_stmt< 'for' any 'in' node=any ':' any* >
            | comp_for< 'for' any 'in' node=any any* >
            | comparison< any 'in' node=any any*>
         """
    p2 = patcomp.compile_pattern(P2)

    def in_special_context(self, node):
        if node.parent is None:
            return False
        results = {}
        if (node.parent.parent is not None and
               self.p1.match(node.parent.parent, results) and
               results["node"] is node):
            # list(d.keys()) -> list(d.keys()), etc.
            return results["func"].value in consuming_calls
        # for ... in d.iterkeys() -> for ... in d.keys(), etc.
        return self.p2.match(node.parent, results) and results["node"] is node