Revert futurize/pasteurize --all-imports --all-imports to add from future.builtins import *

This is instead of this explicit longhand form over multiple lines:

    from future.builtins import (ascii, ...,
                                 ..., zip)

This fixes issue #101.

Author: edschofield

docs/changelog.rst

@@ -642,7 +642,7 @@ imports deemed necessary.
 There is now an ``--all-imports`` option to the ``futurize`` script which
 gives the previous behaviour, which is to add all ``__future__`` imports
 and ``from future.builtins import *`` imports to every module. (This even
-applies to an empty ``__init__.py`` file.
+applies to an empty ``__init__.py`` file.)
 
 
 Looser type-checking for the backported ``str`` object

future/tests/base.py

@@ -246,7 +246,7 @@ def convert_check(self, before, expected, stages=(1, 2), all_imports=False,
         else:
             headers = ''
 
-        self.compare(output, reformat_code(headers + expected),
+        self.compare(output, headers + reformat_code(expected),
                      ignore_imports=ignore_imports)
 
     def unchanged(self, code, **kwargs):

future/tests/test_futurize.py

@@ -1167,5 +1167,41 @@ def __truediv__(self, other):
         self.convert_check(before, after)
 
 
+class TestFuturizeAllImports(CodeHandler):
+    """
+    Tests "futurize --all-imports".
+    """
+    def test_all_imports(self):
+        before = """
+        import math
+        import os
+        l = range(10)
+        assert isinstance(l, list)
+        print 'Hello'
+        for i in xrange(100):
+            pass
+        print('Hello')
+        """
+        after = """
+        from __future__ import unicode_literals
+        from __future__ import print_function
+        from __future__ import division
+        from __future__ import absolute_import
+        from future import standard_library
+        standard_library.install_hooks()
+        from future.builtins import range
+        from future.builtins import *
+        import math
+        import os
+        l = list(range(10))
+        assert isinstance(l, list)
+        print('Hello')
+        for i in range(100):
+            pass
+        print('Hello')
+        """
+        self.convert_check(before, after, all_imports=True)
+
+
 if __name__ == '__main__':
     unittest.main()

libpasteurize/fixes/fix_add_all_future_builtins.py

@@ -25,10 +25,10 @@ class FixAddAllFutureBuiltins(fixer_base.BaseFix):
     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)
+        # 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', '*', node)
 
         # builtins = """ascii bytes chr dict filter hex input
         #                      int list map next object oct open pow