mirror of
https://github.com/python/cpython.git
synced 2025-07-23 11:15:24 +00:00
b1f7b7bef5
svn+ssh://pythondev@svn.python.org/python/trunk
................
r77898 | martin.v.loewis | 2010-02-01 02:15:39 +0100 (Mo, 01 Feb 2010) | 17 lines
Merged revisions 77855-77856,77870 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r77855 | benjamin.peterson | 2010-01-30 17:32:05 +0100 (Sa, 30 Jan 2010) | 1 line
don't return node if it is not changed
........
r77856 | benjamin.peterson | 2010-01-30 17:35:29 +0100 (Sa, 30 Jan 2010) | 1 line
return None to indicate no change
........
r77870 | benjamin.peterson | 2010-01-31 02:21:26 +0100 (So, 31 Jan 2010) | 1 line
never return the original node given to transform()
........
................
63 lines
2.2 KiB
Python
63 lines
2.2 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):
|
|
|
|
PATTERN = """
|
|
power<
|
|
(name='range'|name='xrange') trailer< '(' args=any ')' >
|
|
rest=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.prefix))
|
|
|
|
def transform_range(self, node, results):
|
|
if 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
|