Possible fix for issue #94: revert a v0.12-vintage change to fix_future_standard_library

Author: edschofield

libfuturize/fixes/fix_future_standard_library.py

@@ -9,87 +9,18 @@
 
 after any __future__ imports but before any other imports.
 """
-from __future__ import absolute_import, unicode_literals
-
-from lib2to3.fixes.fix_imports import FixImports, MAPPING
-from lib2to3.pgen2 import token
-from lib2to3.pytree import Leaf, Node
-from lib2to3.pygram import python_symbols as syms
-from lib2to3.fixer_util import Name
-from lib2to3 import patcomp
 
+from lib2to3.fixes.fix_imports import FixImports
 from libfuturize.fixer_util import touch_import_top
-from future.builtins import str
-
-BACKPORTS = set(['http', 'xmlrpc', 'email', 'urllib', 'html'])
-
-future_mapping = {}
-
-
-# These modules exist on Py2 and Py2.7 so they needn't be replaced by
-# future.standard_library.io etc.:
-IN_PY2 = ['io', 'pickle', 'collections', 'subprocess']
-
-
-for (old, new) in MAPPING.items():
-    # if new in IN_PY2:
-    #     continue
-    if any([new.startswith(toplevel) for toplevel in BACKPORTS]):
-        # Change e.g. urllib.request to urllib_request
-        # if '.' in new:
-        #     new.replace('.', '_')
-        future_mapping[old] = ('future.standard_library.' + new,
-                               new.replace('.', '_'))
-    else:
-        future_mapping[old] = (new,)
 
 
 class FixFutureStandardLibrary(FixImports):
     run_order = 8
-    mapping = future_mapping
 
     def transform(self, node, results):
-        import_mod = results.get("module_name")
-        if import_mod:
-            mod_name = import_mod.value
-            if len(self.mapping[mod_name]) > 1:
-                new_name1, new_name2 = map(str, self.mapping[mod_name])
-                # import_mod.replace(Name(new_name, prefix=import_mod.prefix))
-                children = [Leaf(token.NAME, new_name1, prefix=u" "),
-                            Leaf(token.NAME, u"as", prefix=u" "),
-                            Leaf(token.NAME, new_name2, prefix=u" ")]
-                imp = Node(syms.dotted_as_name, children)
-            else:
-                new_name = self.mapping[mod_name][0]
-                imp = Name(new_name, prefix=import_mod.prefix)
-                new_name2 = new_name
-
-            import_mod.replace(imp)
-
-            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.
-                # TODO: fix this so that each module is imported only once.
-                self.replace[mod_name] = new_name2
-            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))
+        result = super(FixFutureStandardLibrary, self).transform(node, results)
+        # TODO: add a blank line between any __future__ imports and this?
         touch_import_top(u'future', u'standard_library', node)
-
-    # def transform(self, node, results):
-    #     result = super(FixFutureStandardLibrary, self).transform(node, results)
-    #     touch_import_top(u'future', u'standard_library', node)
-    #     return result
+        return result