mirror of
https://github.com/python/cpython.git
synced 2025-07-22 02:35:22 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ................ r74114 | benjamin.peterson | 2009-07-20 10:33:09 -0500 (Mon, 20 Jul 2009) | 110 lines Merged revisions 73771,73811,73840,73842,73848-73849,73861,73957-73960,73964-73969,73972-73974,73977,73981,73984,74065,74113 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r73771 | benjamin.peterson | 2009-07-02 10:56:55 -0500 (Thu, 02 Jul 2009) | 1 line force the imports fixer to be run after the import one #6400 ........ r73811 | benjamin.peterson | 2009-07-03 09:03:14 -0500 (Fri, 03 Jul 2009) | 1 line check for sep, not pathsep when looking for a subpackage #6408 ........ r73840 | benjamin.peterson | 2009-07-04 09:52:28 -0500 (Sat, 04 Jul 2009) | 1 line don't print diffs by default; it's annoying ........ r73842 | benjamin.peterson | 2009-07-04 09:58:46 -0500 (Sat, 04 Jul 2009) | 1 line complain when not showing diffs or writing ........ r73848 | alexandre.vassalotti | 2009-07-04 23:38:19 -0500 (Sat, 04 Jul 2009) | 2 lines Fix test_refactor_stdin to handle print_output() method with 4 arguments. ........ r73849 | alexandre.vassalotti | 2009-07-04 23:43:18 -0500 (Sat, 04 Jul 2009) | 5 lines Issue 2370: Add fixer for the removal of operator.isCallable() and operator.sequenceIncludes(). Patch contributed by Jeff Balogh (and updated by me). ........ r73861 | benjamin.peterson | 2009-07-05 09:15:53 -0500 (Sun, 05 Jul 2009) | 1 line cleanup and use unicode where appropiate ........ r73957 | benjamin.peterson | 2009-07-11 15:49:56 -0500 (Sat, 11 Jul 2009) | 1 line fix calls to str() with unicode() ........ r73958 | benjamin.peterson | 2009-07-11 15:51:51 -0500 (Sat, 11 Jul 2009) | 1 line more str() -> unicode() ........ r73959 | benjamin.peterson | 2009-07-11 16:40:08 -0500 (Sat, 11 Jul 2009) | 1 line add tests for refactor_dir() ........ r73960 | benjamin.peterson | 2009-07-11 16:44:32 -0500 (Sat, 11 Jul 2009) | 1 line don't parse files just because they end with 'py' (no dot) ........ r73964 | benjamin.peterson | 2009-07-11 17:30:15 -0500 (Sat, 11 Jul 2009) | 1 line simplify ........ r73965 | benjamin.peterson | 2009-07-11 17:31:30 -0500 (Sat, 11 Jul 2009) | 1 line remove usage of get_prefix() ........ r73966 | benjamin.peterson | 2009-07-11 17:33:35 -0500 (Sat, 11 Jul 2009) | 1 line revert unintended change in 73965 ........ r73967 | benjamin.peterson | 2009-07-11 17:34:44 -0500 (Sat, 11 Jul 2009) | 1 line avoid expensive checks and assume the node did change ........ r73968 | benjamin.peterson | 2009-07-11 20:46:46 -0500 (Sat, 11 Jul 2009) | 1 line use a regular dict for the heads to avoid adding lists in the loop ........ r73969 | benjamin.peterson | 2009-07-11 20:50:43 -0500 (Sat, 11 Jul 2009) | 1 line prefix headnode functions with '_' ........ r73972 | benjamin.peterson | 2009-07-11 21:25:45 -0500 (Sat, 11 Jul 2009) | 1 line try to make the head node dict as sparse as possible ........ r73973 | benjamin.peterson | 2009-07-11 21:59:49 -0500 (Sat, 11 Jul 2009) | 1 line a better idea; add an option to *not* print diffs ........ r73974 | benjamin.peterson | 2009-07-11 22:00:29 -0500 (Sat, 11 Jul 2009) | 1 line add space ........ r73977 | benjamin.peterson | 2009-07-12 10:16:07 -0500 (Sun, 12 Jul 2009) | 1 line update get_headnode_dict tests for recent changes ........ r73981 | benjamin.peterson | 2009-07-12 12:06:39 -0500 (Sun, 12 Jul 2009) | 4 lines detect when "from __future__ import print_function" is given Deprecate the 'print_function' option and the -p flag ........ r73984 | benjamin.peterson | 2009-07-12 16:16:37 -0500 (Sun, 12 Jul 2009) | 1 line add tests for Call; thanks Joe Amenta ........ r74065 | benjamin.peterson | 2009-07-17 12:52:49 -0500 (Fri, 17 Jul 2009) | 1 line pathname2url and url2pathname are in urllib.request not urllib.parse #6496 ........ r74113 | benjamin.peterson | 2009-07-20 08:56:57 -0500 (Mon, 20 Jul 2009) | 1 line fix deprecation warnings in tests ........ ................
143 lines
5.5 KiB
Python
143 lines
5.5 KiB
Python
"""Fix incompatible imports and module references."""
|
|
# Authors: Collin Winter, Nick Edds
|
|
|
|
# Local imports
|
|
from .. import fixer_base
|
|
from ..fixer_util import Name, attr_chain
|
|
|
|
MAPPING = {'StringIO': 'io',
|
|
'cStringIO': 'io',
|
|
'cPickle': 'pickle',
|
|
'__builtin__' : 'builtins',
|
|
'copy_reg': 'copyreg',
|
|
'Queue': 'queue',
|
|
'SocketServer': 'socketserver',
|
|
'ConfigParser': 'configparser',
|
|
'repr': 'reprlib',
|
|
'FileDialog': 'tkinter.filedialog',
|
|
'tkFileDialog': 'tkinter.filedialog',
|
|
'SimpleDialog': 'tkinter.simpledialog',
|
|
'tkSimpleDialog': 'tkinter.simpledialog',
|
|
'tkColorChooser': 'tkinter.colorchooser',
|
|
'tkCommonDialog': 'tkinter.commondialog',
|
|
'Dialog': 'tkinter.dialog',
|
|
'Tkdnd': 'tkinter.dnd',
|
|
'tkFont': 'tkinter.font',
|
|
'tkMessageBox': 'tkinter.messagebox',
|
|
'ScrolledText': 'tkinter.scrolledtext',
|
|
'Tkconstants': 'tkinter.constants',
|
|
'Tix': 'tkinter.tix',
|
|
'ttk': 'tkinter.ttk',
|
|
'Tkinter': 'tkinter',
|
|
'markupbase': '_markupbase',
|
|
'_winreg': 'winreg',
|
|
'thread': '_thread',
|
|
'dummy_thread': '_dummy_thread',
|
|
# anydbm and whichdb are handled by fix_imports2
|
|
'dbhash': 'dbm.bsd',
|
|
'dumbdbm': 'dbm.dumb',
|
|
'dbm': 'dbm.ndbm',
|
|
'gdbm': 'dbm.gnu',
|
|
'xmlrpclib': 'xmlrpc.client',
|
|
'DocXMLRPCServer': 'xmlrpc.server',
|
|
'SimpleXMLRPCServer': 'xmlrpc.server',
|
|
'httplib': 'http.client',
|
|
'htmlentitydefs' : 'html.entities',
|
|
'HTMLParser' : 'html.parser',
|
|
'Cookie': 'http.cookies',
|
|
'cookielib': 'http.cookiejar',
|
|
'BaseHTTPServer': 'http.server',
|
|
'SimpleHTTPServer': 'http.server',
|
|
'CGIHTTPServer': 'http.server',
|
|
#'test.test_support': 'test.support',
|
|
'commands': 'subprocess',
|
|
'UserString' : 'collections',
|
|
'UserList' : 'collections',
|
|
'urlparse' : 'urllib.parse',
|
|
'robotparser' : 'urllib.robotparser',
|
|
}
|
|
|
|
|
|
def alternates(members):
|
|
return "(" + "|".join(map(repr, members)) + ")"
|
|
|
|
|
|
def build_pattern(mapping=MAPPING):
|
|
mod_list = ' | '.join(["module_name='%s'" % key for key in mapping])
|
|
bare_names = alternates(mapping.keys())
|
|
|
|
yield """name_import=import_name< 'import' ((%s) |
|
|
multiple_imports=dotted_as_names< any* (%s) any* >) >
|
|
""" % (mod_list, mod_list)
|
|
yield """import_from< 'from' (%s) 'import' ['(']
|
|
( any | import_as_name< any 'as' any > |
|
|
import_as_names< any* >) [')'] >
|
|
""" % mod_list
|
|
yield """import_name< 'import' (dotted_as_name< (%s) 'as' any > |
|
|
multiple_imports=dotted_as_names<
|
|
any* dotted_as_name< (%s) 'as' any > any* >) >
|
|
""" % (mod_list, mod_list)
|
|
|
|
# Find usages of module members in code e.g. thread.foo(bar)
|
|
yield "power< bare_with_attr=(%s) trailer<'.' any > any* >" % bare_names
|
|
|
|
|
|
class FixImports(fixer_base.BaseFix):
|
|
|
|
# This is overridden in fix_imports2.
|
|
mapping = MAPPING
|
|
|
|
# We want to run this fixer late, so fix_import doesn't try to make stdlib
|
|
# renames into relative imports.
|
|
run_order = 6
|
|
|
|
def build_pattern(self):
|
|
return "|".join(build_pattern(self.mapping))
|
|
|
|
def compile_pattern(self):
|
|
# We override this, so MAPPING can be pragmatically altered and the
|
|
# changes will be reflected in PATTERN.
|
|
self.PATTERN = self.build_pattern()
|
|
super(FixImports, self).compile_pattern()
|
|
|
|
# Don't match the node if it's within another match.
|
|
def match(self, node):
|
|
match = super(FixImports, self).match
|
|
results = match(node)
|
|
if results:
|
|
# Module usage could be in the trailer of an attribute lookup, so we
|
|
# might have nested matches when "bare_with_attr" is present.
|
|
if "bare_with_attr" not in results and \
|
|
any([match(obj) for obj in attr_chain(node, "parent")]):
|
|
return False
|
|
return results
|
|
return False
|
|
|
|
def start_tree(self, tree, filename):
|
|
super(FixImports, self).start_tree(tree, filename)
|
|
self.replace = {}
|
|
|
|
def transform(self, node, results):
|
|
import_mod = results.get("module_name")
|
|
if import_mod:
|
|
mod_name = import_mod.value
|
|
new_name = self.mapping[mod_name]
|
|
import_mod.replace(Name(new_name, prefix=import_mod.prefix))
|
|
if "name_import" in results:
|
|
# If it's not a "from x import x, y" or "import x as y" import,
|
|
# marked its usage to be replaced.
|
|
self.replace[mod_name] = new_name
|
|
if "multiple_imports" in results:
|
|
# This is a nasty hack to fix multiple imports on a line (e.g.,
|
|
# "import StringIO, urlparse"). The problem is that I can't
|
|
# figure out an easy way to make a pattern recognize the keys of
|
|
# MAPPING randomly sprinkled in an import statement.
|
|
results = self.match(node)
|
|
if results:
|
|
self.transform(node, results)
|
|
else:
|
|
# Replace usage of the module.
|
|
bare_name = results["bare_with_attr"][0]
|
|
new_name = self.replace.get(bare_name.value)
|
|
if new_name:
|
|
bare_name.replace(Name(new_name, prefix=bare_name.prefix))
|