Merge pull request #446 from sectioneight/future-import-order

Fix future import ordering

Author: jmadler

src/future/tests/base.py

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

src/libfuturize/fixes/fix_add__future__imports_except_unicode_literals.py

@@ -21,6 +21,6 @@ class FixAddFutureImportsExceptUnicodeLiterals(fixer_base.BaseFix):
 
     def transform(self, node, results):
         # Reverse order:
-        future_import(u"print_function", node)
-        future_import(u"division", node)
         future_import(u"absolute_import", node)
+        future_import(u"division", node)
+        future_import(u"print_function", node)

src/libpasteurize/fixes/fix_add_all__future__imports.py

@@ -18,7 +18,7 @@ class FixAddAllFutureImports(fixer_base.BaseFix):
     run_order = 1
 
     def transform(self, node, results):
-        future_import(u"unicode_literals", node)
-        future_import(u"print_function", node)
-        future_import(u"division", node)
         future_import(u"absolute_import", node)
+        future_import(u"division", node)
+        future_import(u"print_function", node)
+        future_import(u"unicode_literals", node)

tests/test_future/test_futurize.py

@@ -1361,6 +1361,7 @@ def test_open(self):
         """
         self.convert_check(before, after, conservative=True)
 
+
 class TestFuturizeAllImports(CodeHandler):
     """
     Tests "futurize --all-imports".
@@ -1378,14 +1379,14 @@ def test_all_imports(self):
         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 division
+        from __future__ import print_function
+        from __future__ import unicode_literals
         from future import standard_library
         standard_library.install_aliases()
-        from builtins import range
         from builtins import *
+        from builtins import range
         import math
         import os
         l = list(range(10))
@@ -1395,7 +1396,7 @@ def test_all_imports(self):
             pass
         print('Hello')
         """
-        self.convert_check(before, after, all_imports=True)
+        self.convert_check(before, after, all_imports=True, ignore_imports=False)
 
 
 if __name__ == '__main__':