Update fixers invoked by pasteurize --all-imports

Author: edschofield

docs/futurize.rst

@@ -154,7 +154,6 @@ The complete set of fixers applied by ``futurize --stage1`` is:
     libfuturize.fixes.fix_next_call
     libfuturize.fixes.fix_print_with_import
     libfuturize.fixes.fix_raise
-    libfuturize.fixes.fix_order___future__imports
 
 
 Not applied:
@@ -298,7 +297,6 @@ A complete list of fixers applied in Stage 2 is::
     libfuturize.fixes.fix_metaclass
     libpasteurize.fixes.fix_newstyle
     libfuturize.fixes.fix_object
-    libfuturize.fixes.fix_order___future__imports
     libfuturize.fixes.fix_unicode_keep_u
     libfuturize.fixes.fix_xrange_with_import
 

libfuturize/fixer_util.py

@@ -306,6 +306,10 @@ def touch_import_top(package, name_to_import, node):
     if does_tree_import(package, name_to_import, root):
         return
 
+    # Ideally, we would look for whether futurize --all-imports has been run,
+    # as indicated by the presence of ``from future.builtins import (ascii, ...,
+    # zip)`` -- and, if it has, we wouldn't import the name again.
+
     # Look for __future__ imports and insert below them
     found = False
     for name in ['absolute_import', 'division', 'print_function',

libfuturize/fixes/__init__.py

@@ -75,7 +75,7 @@
                                         # the ``next`` method to ``__next__``.
     'libfuturize.fixes.fix_print_with_import',
     'libfuturize.fixes.fix_raise',
-    'libfuturize.fixes.fix_order___future__imports',  # TODO: consolidate to a single line to simplify testing
+    # 'libfuturize.fixes.fix_order___future__imports',  # TODO: consolidate to a single line to simplify testing
 ])
 
 libfuturize_fix_names_stage2 = set([
@@ -89,7 +89,7 @@
     'libfuturize.fixes.fix_metaclass',
     'libpasteurize.fixes.fix_newstyle',
     'libfuturize.fixes.fix_object',
-    'libfuturize.fixes.fix_order___future__imports',  # TODO: consolidate to a single line to simplify testing
+    # 'libfuturize.fixes.fix_order___future__imports',  # TODO: consolidate to a single line to simplify testing
     'libfuturize.fixes.fix_unicode_keep_u',
     # 'libfuturize.fixes.fix_unicode_literals_import',
     'libfuturize.fixes.fix_xrange_with_import',  # custom one because of a bug with Py3.3's lib2to3

libfuturize/main.py

@@ -210,11 +210,6 @@ def main(args=None):
 
     unwanted_fixes = set(fixer_pkg + ".fix_" + fix for fix in options.nofix)
 
-    # The 'all-imports' option forces adding all __future__ imports and "from
-    # future import standard_library", even if they don't seem necessary for
-    # the current state of each module. (This can simplify testing, and can
-    # reduce the need to think about Py2 compatibility when editing the code
-    # further.)
     extra_fixes = set()
     if options.all_imports:
         if options.stage1:

libpasteurize/fixes/__init__.py

@@ -3,9 +3,9 @@
 
 # The original set of these fixes comes from lib3to2 (https://bitbucket.org/amentajo/lib3to2):
 fix_names = set([
-                 'libfuturize.fixes.fix_add__future__imports',  # from __future__ import absolute_import etc. on separate lines
+                 'libpasteurize.fixes.fix_add_all__future__imports',  # from __future__ import absolute_import etc. on separate lines
                  'libpasteurize.fixes.fix_add_future_standard_library_import',  # we force adding this import for now, even if it doesn't seem necessary to the fix_future_standard_library fixer, for ease of testing
-                 'libfuturize.fixes.fix_order___future__imports',  # consolidates to a single line to simplify testing
+                 # 'libfuturize.fixes.fix_order___future__imports',  # consolidates to a single line to simplify testing -- UNFINISHED
                  'libpasteurize.fixes.fix_future_builtins',   # adds "from future.builtins import *"
                  'libfuturize.fixes.fix_future_standard_library', # adds "from future import standard_library"
 

libpasteurize/fixes/fix_add_all_future_builtins.py

@@ -30,3 +30,9 @@ def transform(self, node, results):
                              range, round, str, super, zip)"""
         touch_import_top(u'future.builtins', import_str, node)
 
+        # builtins = """ascii bytes chr dict filter hex input
+        #                      int list map next object oct open pow
+        #                      range round str super zip"""
+        # for builtin in sorted(builtins.split(), reverse=True):
+        #     touch_import_top(u'future.builtins', builtin, node)
+

libpasteurize/main.py

@@ -28,6 +28,12 @@
 Python 3 with ``pasteurize`` as they are when converting from Python 2 with
 ``futurize``.
 
+The --all-imports option forces adding all ``__future__`` imports,
+``future.builtins`` imports, and standard library hooks, even if they don't
+seem necessary for the current state of each module. (This can simplify
+testing, and can reduce the need to think about Py2 compatibility when editing
+the code further.)
+
 """
 
 from __future__ import (absolute_import, print_function, unicode_literals)
@@ -115,22 +121,12 @@ def main(args=None):
     # Initialize the refactoring tool
     unwanted_fixes = set(fixer_pkg + ".fix_" + fix for fix in options.nofix)
 
-    # The 'all-imports' option forces adding all imports __future__ and "from
-    # future import standard_library", even if they don't seem necessary for
-    # the current state of each module. (This can simplify testing, and can
-    # reduce the need to think about Py2 compatibility when editing the code
-    # further.)
     extra_fixes = set()
     if options.all_imports:
-        prefix = 'libfuturize.fixes.'
-        if options.stage1:
-            extra_fixes.add(prefix +
-                            'fix_add__future__imports_except_unicode_literals')
-        else:
-            # In case the user hasn't run stage1 for some reason:
-            extra_fixes.add(prefix + 'fix_add__future__imports')
-            extra_fixes.add(prefix + 'fix_add_future_standard_library_import')
-            extra_fixes.add(prefix + 'fix_add_all_future_builtins')
+        prefix = 'libpasteurize.fixes.'
+        extra_fixes.add(prefix + 'fix_add_all__future__imports')
+        extra_fixes.add(prefix + 'fix_add_future_standard_library_import')
+        extra_fixes.add(prefix + 'fix_add_all_future_builtins')
 
     fixer_names = avail_fixes | extra_fixes - unwanted_fixes