mirror of
https://github.com/python/cpython.git
synced 2025-11-03 19:34:08 +00:00
f37eb3a184
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r83852 | benjamin.peterson | 2010-08-08 15:45:44 -0500 (Sun, 08 Aug 2010) | 1 line wrap with parens ........ r83853 | benjamin.peterson | 2010-08-08 15:46:31 -0500 (Sun, 08 Aug 2010) | 1 line use parens ........ r83857 | benjamin.peterson | 2010-08-08 15:59:49 -0500 (Sun, 08 Aug 2010) | 1 line things which use touch_import should be pre order ........ r84042 | george.boutsioukis | 2010-08-14 16:10:19 -0500 (Sat, 14 Aug 2010) | 2 lines This revision incorporates into the 2to3 tool the new, faster, tree matching algorithm developed during a GSOC project. The algorithm resides in the two added modules, btm_matcher and btm_utils. New code has been added to drive the new matching process in refactor.py and a few minor changes were made in other modules. A BM_compatible flag(False by default) has been added in fixer_base and it is set to True in most of the current fixers. ........ r84216 | benjamin.peterson | 2010-08-19 16:44:05 -0500 (Thu, 19 Aug 2010) | 1 line allow star_expr in testlist_gexp ........ r84274 | benjamin.peterson | 2010-08-22 18:40:46 -0500 (Sun, 22 Aug 2010) | 1 line wrap long line ........ r84275 | benjamin.peterson | 2010-08-22 18:42:22 -0500 (Sun, 22 Aug 2010) | 1 line cleanup ........ r84276 | benjamin.peterson | 2010-08-22 18:51:01 -0500 (Sun, 22 Aug 2010) | 1 line when there's a None value and a traceback, don't call type with it #9661 ........ r84375 | george.boutsioukis | 2010-08-31 08:38:53 -0500 (Tue, 31 Aug 2010) | 3 lines Idiomatic code changes & stylistic issues fixed in the BottomMatcher module. Thanks to Benjamin Peterson for taking the time to review the code. ........ r85388 | benjamin.peterson | 2010-10-12 17:27:44 -0500 (Tue, 12 Oct 2010) | 1 line fix urllib fixer with multiple as imports on a line #10069 ........ r85478 | benjamin.peterson | 2010-10-14 08:09:56 -0500 (Thu, 14 Oct 2010) | 1 line stop abusing docstrings ........ r85506 | benjamin.peterson | 2010-10-14 17:45:19 -0500 (Thu, 14 Oct 2010) | 1 line kill sibling import ........ r85507 | benjamin.peterson | 2010-10-14 17:54:15 -0500 (Thu, 14 Oct 2010) | 1 line remove trailing whitespace ........ r85508 | benjamin.peterson | 2010-10-14 17:55:28 -0500 (Thu, 14 Oct 2010) | 1 line typo ........
73 lines
2.6 KiB
Python
73 lines
2.6 KiB
Python
# 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):
|
|
BM_compatible = True
|
|
PATTERN = """
|
|
power<
|
|
(name='range'|name='xrange') trailer< '(' args=any ')' >
|
|
rest=any* >
|
|
"""
|
|
|
|
def start_tree(self, tree, filename):
|
|
super(FixXrange, self).start_tree(tree, filename)
|
|
self.transformed_xranges = set()
|
|
|
|
def finish_tree(self, tree, filename):
|
|
self.transformed_xranges = None
|
|
|
|
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.prefix))
|
|
# This prevents the new range call from being wrapped in a list later.
|
|
self.transformed_xranges.add(id(node))
|
|
|
|
def transform_range(self, node, results):
|
|
if (id(node) not in self.transformed_xranges and
|
|
not self.in_special_context(node)):
|
|
range_call = Call(Name("range"), [results["args"].clone()])
|
|
# Encase the range call in list().
|
|
list_call = Call(Name("list"), [range_call],
|
|
prefix=node.prefix)
|
|
# Put things that were after the range() call after the list call.
|
|
for n in results["rest"]:
|
|
list_call.append_child(n)
|
|
return list_call
|
|
|
|
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
|