Merge branch 'master' into simplification

Author: brettcannon

libmodernize/fixes/__init__.py

@@ -30,6 +30,7 @@
     'libmodernize.fixes.fix_basestring',
     'libmodernize.fixes.fix_dict_six',
     'libmodernize.fixes.fix_filter',
+    'libmodernize.fixes.fix_imports_six',
     'libmodernize.fixes.fix_input_six',
     'libmodernize.fixes.fix_map',
     'libmodernize.fixes.fix_metaclass',

libmodernize/fixes/fix_imports_six.py

@@ -0,0 +1,62 @@
+from lib2to3.fixes import fix_imports
+
+
+class FixImportsSix(fix_imports.FixImports):
+
+    mapping = {
+        '__builtin__': 'six.moves.builtins',
+        '_winreg': 'six.moves.winreg',
+        'BaseHTTPServer': 'six.moves.BaseHTTPServer',
+        'CGIHTTPServer': 'six.moves.CGIHTTPServer',
+        'ConfigParser': 'six.moves.configparser',
+        'copy_reg': 'six.moves.copyreg',
+        'Cookie': 'six.moves.http_cookies',
+        'cookielib': 'six.moves.http_cookiejar',
+        'cPickle': 'six.moves.cPickle',
+        'Dialog': 'six.moves.tkinter_dialog',
+        'dummy_thread': 'six.moves._dummy_thread',
+        # cStringIO.StringIO()
+        # email.MIMEBase
+        # email.MIMEMultipart
+        # email.MIMENonMultipart
+        # email.MIMEText
+        'FileDialog': 'six.moves.tkinter_filedialog',
+        'gdbm': 'six.moves.dbm_gnu',
+        'htmlentitydefs': 'six.moves.html_entities',
+        'HTMLParser': 'six.moves.html_parser',
+        'httplib': 'six.moves.http_client',
+        # intern()
+        # itertools.ifilter()
+        # itertools.ifilterfalse()
+        # itertools.imap()
+        # itertools.izip()
+        # itertools.zip_longest()
+        # pipes.quote
+        'Queue': 'six.moves.queue',
+        # reduce()
+        # reload()
+        'repr': 'six.moves.reprlib',
+        'robotparser': 'six.moves.urllib_robotparser',
+        'ScrolledText': 'six.moves.tkinter_scrolledtext',
+        'SimpleDialog': 'six.moves.tkinter_simpledialog',
+        'SimpleHTTPServer': 'six.moves.SimpleHTTPServer',
+        'SimpleXMLRPCServer': 'six.moves.xmlrpc_server',
+        'SocketServer': 'six.moves.socketserver',
+        'thread': 'six.moves._thread',
+        'Tix': 'six.moves.tkinter_tix',
+        'tkColorChooser': 'six.moves.tkinter_colorchooser',
+        'tkCommonDialog': 'six.moves.tkinter_commondialog',
+        'Tkconstants': 'six.moves.tkinter_constants',
+        'Tkdnd': 'six.moves.tkinter_dnd',
+        'tkFileDialog': 'six.moves.tkinter_filedialog',
+        'tkFont': 'six.moves.tkinter_font',
+        'Tkinter': 'six.moves.tkinter',
+        'tkMessageBox': 'six.moves.tkinter_messagebox',
+        'tkSimpleDialog': 'six.moves.tkinter_tksimpledialog',
+        'ttk': 'six.moves.tkinter_ttk',
+        # urllib
+        # UserDict.UserDict
+        # UserList.UserList
+        # UserString.UserString
+        'xmlrpclib': 'six.moves.xmlrpc_client',
+    }

libmodernize/fixes/fix_open.py

@@ -4,17 +4,13 @@
 import libmodernize
 
 
-class FixOpen(fixer_base.ConditionalFix):
+class FixOpen(fixer_base.BaseFix):
 
     BM_compatible = True
-    order = "pre"
-    skip_on = "io.open"
-
+    # Fixers don't directly stack, so make sure the 'file' case is covered.
     PATTERN = """
-    power< 'open' trailer< '(' any+ ')' > >
+    power< ('open' | 'file') trailer< '(' any+ ')' > >
     """
 
     def transform(self, node, results):
-        if self.should_skip(node):
-            return
         libmodernize.touch_import(u'io', u'open', node)

tests/test_fix_imports_six.py

@@ -0,0 +1,47 @@
+from __future__ import absolute_import
+
+import sys
+
+try:
+    from six.moves import tkinter
+except ImportError:
+    tkinter = None
+
+from libmodernize.fixes import fix_imports_six
+
+from utils import check_on_input
+
+
+MOVED_MODULE = ("""\
+import ConfigParser
+ConfigParser.ConfigParser()
+""", """\
+import six.moves.configparser
+six.moves.configparser.ConfigParser()
+""")
+
+MOVED_MODULE_FROMLIST = ("""\
+from ConfigParser import ConfigParser
+ConfigParser()
+""", """\
+from six.moves.configparser import ConfigParser
+ConfigParser()
+""")
+
+
+def test_moved_module():
+    check_on_input(*MOVED_MODULE)
+
+def test_moved_module_fromlist():
+    check_on_input(*MOVED_MODULE_FROMLIST)
+
+def test_validate_mapping():
+    for py2_name, six_name in fix_imports_six.FixImportsSix.mapping.items():
+        try:
+            __import__(py2_name)
+            __import__(six_name)
+        except ImportError as exc:
+            if 'tkinter' in six_name and tkinter is not None:
+                raise
+            elif 'winreg' in six_name and sys.platform.startswith('win'):
+                raise

tests/test_fix_open.py

@@ -4,7 +4,7 @@
 
 
 OPEN = ("""\
-open('some/path')
+{0}('some/path')
 """, """\
 from __future__ import absolute_import
 from io import open
@@ -13,7 +13,13 @@
 
 
 def test_open():
-    check_on_input(*OPEN, extra_flags=['-f', 'libmodernize.fixes.fix_open'])
+    check_on_input(OPEN[0].format('open'), OPEN[1],
+                   extra_flags=['-f', 'libmodernize.fixes.fix_open'])
 
 def test_open_optional():
-    check_on_input(OPEN[0], OPEN[0])
+    check_on_input(OPEN[0].format('open'), OPEN[0].format('open'))
+
+def test_file():
+    flags = ['-f', 'libmodernize.fixes.fix_open',
+             '-f', 'libmodernize.fixes.fix_file']
+    check_on_input(OPEN[0].format('file'), OPEN[1], extra_flags=flags)

tests/test_fixes.py

@@ -15,7 +15,7 @@ def check_existence(prefix, module_names):
     dotted_prefix = prefix + '.'
     for module_name in module_names:
         if not module_name.startswith(dotted_prefix):
-            msg = '{0!r} does not start with {1!r}'.format(module_name, lib2to3_prefix)
+            msg = '{0!r} does not start with {1!r}'.format(module_name, prefix)
             raise AssertionError(msg)
         try:
             __import__(module_name)