Update fixers invoked by futurize --all-imports

Author: edschofield

libfuturize/main.py

@@ -53,11 +53,11 @@
 All imports
 -----------
 
-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.)
+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.)
 
 """
 
@@ -217,13 +217,14 @@ def main(args=None):
     # further.)
     extra_fixes = set()
     if options.all_imports:
-        prefix = 'libfuturize.fixes.'
         if options.stage1:
+            prefix = 'libfuturize.fixes.'
             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')
+            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')
     explicit = set()

…turize/fixes/fix_add__future__imports.py …ze/fixes/fix_add_all__future__imports.pylibfuturize/fixes/fix_add__future__imports.py renamed to libpasteurize/fixes/fix_add_all__future__imports.py libfuturize/fixes/fix_add__future__imports.py renamed to libpasteurize/fixes/fix_add_all__future__imports.py

@@ -12,7 +12,7 @@
 from lib2to3 import fixer_base
 from libfuturize.fixer_util import future_import
 
-class FixAddFutureImports(fixer_base.BaseFix):
+class FixAddAllFutureImports(fixer_base.BaseFix):
     BM_compatible = True
     PATTERN = "file_input"
     run_order = 1

libpasteurize/fixes/fix_add_all_future_builtins.py

@@ -0,0 +1,32 @@
+"""
+For the ``future`` package.
+
+Adds this import line::
+
+    from future.builtins import (ascii, bytes, chr, dict, filter, hex, input,
+                                 int, list, map, next, object, oct, open, pow,
+                                 range, round, str, super, zip)
+
+to a module, irrespective of whether each definition is used.
+
+Adds these imports after any other imports (in an initial block of them).
+"""
+
+from __future__ import unicode_literals
+
+from lib2to3 import fixer_base
+
+from libfuturize.fixer_util import touch_import_top
+
+
+class FixAddAllFutureBuiltins(fixer_base.BaseFix):
+    BM_compatible = True
+    PATTERN = "file_input"
+    run_order = 1
+
+    def transform(self, node, results):
+        import_str = """(ascii, bytes, chr, dict, filter, hex, input,
+                             int, list, map, next, object, oct, open, pow,
+                             range, round, str, super, zip)"""
+        touch_import_top(u'future.builtins', import_str, node)
+