mirror of
				https://github.com/python/cpython.git
				synced 2025-11-03 19:34:08 +00:00 
			
		
		
		
	svn+ssh://pythondev@svn.python.org/python/trunk
................
  r73370 | benjamin.peterson | 2009-06-11 17:06:46 -0500 (Thu, 11 Jun 2009) | 105 lines
  Merged revisions 72523,72950-72951,72994,73003,73033,73036-73040,73091-73093,73096,73179-73181,73192,73231,73244,73255-73256,73365 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
  ........
    r72523 | benjamin.peterson | 2009-05-09 14:42:26 -0500 (Sat, 09 May 2009) | 1 line
    remove parenthesis
  ........
    r72950 | benjamin.peterson | 2009-05-26 18:19:45 -0500 (Tue, 26 May 2009) | 1 line
    remove unused imports
  ........
    r72951 | benjamin.peterson | 2009-05-26 18:27:00 -0500 (Tue, 26 May 2009) | 1 line
    this is no longer executable
  ........
    r72994 | benjamin.peterson | 2009-05-28 15:32:54 -0500 (Thu, 28 May 2009) | 1 line
    fix test_all_fixers on Windows #6134
  ........
    r73003 | benjamin.peterson | 2009-05-28 21:57:28 -0500 (Thu, 28 May 2009) | 4 lines
    make 2to3 test utilities easier to use with other applications (3to2)
    Patch by Joe Amenta
  ........
    r73033 | benjamin.peterson | 2009-05-29 16:58:32 -0500 (Fri, 29 May 2009) | 1 line
    update grammar for multi with statement
  ........
    r73036 | benjamin.peterson | 2009-05-29 17:33:20 -0500 (Fri, 29 May 2009) | 1 line
    simplify fix_unicode
  ........
    r73037 | benjamin.peterson | 2009-05-29 17:53:03 -0500 (Fri, 29 May 2009) | 1 line
    add custom error for pattern syntax errors
  ........
    r73038 | benjamin.peterson | 2009-05-29 17:55:00 -0500 (Fri, 29 May 2009) | 1 line
    complain if details are attached to a token
  ........
    r73039 | benjamin.peterson | 2009-05-29 18:00:28 -0500 (Fri, 29 May 2009) | 1 line
    add a test for whitespace
  ........
    r73040 | benjamin.peterson | 2009-05-29 18:01:17 -0500 (Fri, 29 May 2009) | 1 line
    a fix for emacs highlighting
  ........
    r73091 | benjamin.peterson | 2009-05-31 20:55:25 -0500 (Sun, 31 May 2009) | 1 line
    deprecate set_prefix() and get_prefix() in favor of a prefix property
  ........
    r73092 | benjamin.peterson | 2009-05-31 21:00:51 -0500 (Sun, 31 May 2009) | 1 line
    change hideous java naming scheme
  ........
    r73093 | benjamin.peterson | 2009-05-31 21:01:39 -0500 (Sun, 31 May 2009) | 1 line
    remove dated comment
  ........
    r73096 | benjamin.peterson | 2009-05-31 21:40:53 -0500 (Sun, 31 May 2009) | 1 line
    group tests
  ........
    r73179 | benjamin.peterson | 2009-06-03 13:09:53 -0500 (Wed, 03 Jun 2009) | 1 line
    handle the case where there's multiple trailers #6185
  ........
    r73180 | benjamin.peterson | 2009-06-03 13:18:05 -0500 (Wed, 03 Jun 2009) | 1 line
    scrap __main__ section
  ........
    r73181 | benjamin.peterson | 2009-06-03 13:24:48 -0500 (Wed, 03 Jun 2009) | 1 line
    remove shebang lines and __main__ sections
  ........
    r73192 | benjamin.peterson | 2009-06-03 19:16:30 -0500 (Wed, 03 Jun 2009) | 4 lines
    actually test something here
    Thanks to Joe Amenta for noticing.y
  ........
    r73231 | benjamin.peterson | 2009-06-04 13:38:50 -0500 (Thu, 04 Jun 2009) | 1 line
    remove unused variable
  ........
    r73244 | benjamin.peterson | 2009-06-05 08:39:25 -0500 (Fri, 05 Jun 2009) | 1 line
    allow fixers to give different options in setUp
  ........
    r73255 | benjamin.peterson | 2009-06-06 11:23:46 -0500 (Sat, 06 Jun 2009) | 1 line
    fix the except fixer on one line suites #6222
  ........
    r73256 | benjamin.peterson | 2009-06-06 11:27:40 -0500 (Sat, 06 Jun 2009) | 1 line
    test one-line else and finally clauses
  ........
    r73365 | benjamin.peterson | 2009-06-11 17:01:32 -0500 (Thu, 11 Jun 2009) | 1 line
    normalize whitespace
  ........
................
		
	
			
		
			
				
	
	
		
			145 lines
		
	
	
	
		
			5.5 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			145 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):
 | 
						|
 | 
						|
    order = "pre" # Pre-order tree traversal
 | 
						|
 | 
						|
    # 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))
 |