mirror of
https://github.com/python/cpython.git
synced 2025-07-23 03:05:38 +00:00
5cff9312fd
svn+ssh://pythondev@svn.python.org/python/trunk
................
r67428 | benjamin.peterson | 2008-11-28 16:12:14 -0600 (Fri, 28 Nov 2008) | 57 lines
Merged revisions 67384,67386-67387,67389-67390,67392,67399-67400,67403-67405,67426 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r67384 | benjamin.peterson | 2008-11-25 16:13:31 -0600 (Tue, 25 Nov 2008) | 4 lines
don't duplicate calls to start_tree()
RefactoringTool.pre_order values now holds a list of the fixers while pre_order_mapping holds the dict.
........
r67386 | benjamin.peterson | 2008-11-25 16:44:52 -0600 (Tue, 25 Nov 2008) | 1 line
#4423 fix_imports was still replacing usage of a module if attributes were being used
........
r67387 | benjamin.peterson | 2008-11-25 16:47:54 -0600 (Tue, 25 Nov 2008) | 1 line
fix broken test
........
r67389 | benjamin.peterson | 2008-11-25 17:13:17 -0600 (Tue, 25 Nov 2008) | 1 line
remove compatibility code; we only cater to 2.5+
........
r67390 | benjamin.peterson | 2008-11-25 22:03:36 -0600 (Tue, 25 Nov 2008) | 1 line
fix #3994; the usage of changed imports was fixed in nested cases
........
r67392 | benjamin.peterson | 2008-11-26 11:11:40 -0600 (Wed, 26 Nov 2008) | 1 line
simpilfy and comment fix_imports
........
r67399 | benjamin.peterson | 2008-11-26 11:47:03 -0600 (Wed, 26 Nov 2008) | 1 line
remove more compatibility code
........
r67400 | benjamin.peterson | 2008-11-26 12:07:41 -0600 (Wed, 26 Nov 2008) | 1 line
set svn:ignore
........
r67403 | benjamin.peterson | 2008-11-26 13:11:11 -0600 (Wed, 26 Nov 2008) | 1 line
wrap import
........
r67404 | benjamin.peterson | 2008-11-26 13:29:49 -0600 (Wed, 26 Nov 2008) | 1 line
build the fix_imports pattern in compile_pattern, so MAPPING can be changed and reflected in the pattern
........
r67405 | benjamin.peterson | 2008-11-26 14:01:24 -0600 (Wed, 26 Nov 2008) | 1 line
stop ugly messages about runtime errors being from printed
........
r67426 | benjamin.peterson | 2008-11-28 16:01:40 -0600 (Fri, 28 Nov 2008) | 5 lines
don't replace a module name if it is in the middle of a attribute lookup
This fix also stops module names from being replaced if they are not in an attribute lookup.
........
................
69 lines
2.2 KiB
Python
69 lines
2.2 KiB
Python
"""Fix incompatible renames
|
|
|
|
Fixes:
|
|
* sys.maxint -> sys.maxsize
|
|
"""
|
|
# Author: Christian Heimes
|
|
# based on Collin Winter's fix_import
|
|
|
|
# Local imports
|
|
from .. import fixer_base
|
|
from ..fixer_util import Name, attr_chain
|
|
|
|
MAPPING = {"sys": {"maxint" : "maxsize"},
|
|
}
|
|
LOOKUP = {}
|
|
|
|
def alternates(members):
|
|
return "(" + "|".join(map(repr, members)) + ")"
|
|
|
|
|
|
def build_pattern():
|
|
#bare = set()
|
|
for module, replace in list(MAPPING.items()):
|
|
for old_attr, new_attr in list(replace.items()):
|
|
LOOKUP[(module, old_attr)] = new_attr
|
|
#bare.add(module)
|
|
#bare.add(old_attr)
|
|
#yield """
|
|
# import_name< 'import' (module=%r
|
|
# | dotted_as_names< any* module=%r any* >) >
|
|
# """ % (module, module)
|
|
yield """
|
|
import_from< 'from' module_name=%r 'import'
|
|
( attr_name=%r | import_as_name< attr_name=%r 'as' any >) >
|
|
""" % (module, old_attr, old_attr)
|
|
yield """
|
|
power< module_name=%r trailer< '.' attr_name=%r > any* >
|
|
""" % (module, old_attr)
|
|
#yield """bare_name=%s""" % alternates(bare)
|
|
|
|
|
|
class FixRenames(fixer_base.BaseFix):
|
|
PATTERN = "|".join(build_pattern())
|
|
|
|
order = "pre" # Pre-order tree traversal
|
|
|
|
# Don't match the node if it's within another match
|
|
def match(self, node):
|
|
match = super(FixRenames, self).match
|
|
results = match(node)
|
|
if results:
|
|
if any([match(obj) for obj in attr_chain(node, "parent")]):
|
|
return False
|
|
return results
|
|
return False
|
|
|
|
#def start_tree(self, tree, filename):
|
|
# super(FixRenames, self).start_tree(tree, filename)
|
|
# self.replace = {}
|
|
|
|
def transform(self, node, results):
|
|
mod_name = results.get("module_name")
|
|
attr_name = results.get("attr_name")
|
|
#bare_name = results.get("bare_name")
|
|
#import_mod = results.get("module")
|
|
|
|
if mod_name and attr_name:
|
|
new_attr = LOOKUP[(mod_name.value, attr_name.value)]
|
|
attr_name.replace(Name(new_attr, prefix=attr_name.get_prefix()))
|