mirror of
https://github.com/python/cpython.git
synced 2025-11-03 19:34:08 +00:00
df6dc8f107
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.
........
................
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, any, set
|
|
|
|
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()))
|