Merge pull request #86 from python-modernize/85-test-fix-import

Tests for fix_import; also change the fixer to add 'from __future__ import absolute_import' even if the 2to3 fixer makes no changes.

Author: daira

libmodernize/fixes/fix_import.py

@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 from lib2to3.fixes import fix_import
+from lib2to3.fixer_util import syms
 import libmodernize
 
 
@@ -11,8 +12,13 @@ class FixImport(fix_import.FixImport):
     run_order = 1
 
     def transform(self, node, results):
-        results = super(FixImport, self).transform(node, results)
-        if results is None:
+        if self.skip:
             return
+        # We're not interested in __future__ imports here
+        if node.type == syms.import_from \
+                and getattr(results['imp'], 'value', None) == '__future__':
+            return
+
+        # If there are any non-future imports, add absolute_import
         libmodernize.add_future(node, 'absolute_import')
-        return results
+        return super(FixImport, self).transform(node, results)

libmodernize/fixes/fix_int_long_tuple.py

@@ -2,6 +2,7 @@
 
 from lib2to3 import fixer_base
 from lib2to3 import fixer_util
+from libmodernize import touch_import
 
 
 class FixIntLongTuple(fixer_base.BaseFix):
@@ -20,6 +21,6 @@ def transform(self, node, results):
             name = results['name']
             name.replace(fixer_util.Name('int', prefix=name.prefix))
         else:
-            fixer_util.touch_import(None, 'six', node)
+            touch_import(None, 'six', node)
             pair = results['pair']
             pair.replace(fixer_util.Name('six.integer_types', prefix=pair.prefix))

tests/test_fix_import.py

@@ -0,0 +1,43 @@
+from __future__ import absolute_import
+
+from utils import check_on_input
+
+
+NO_IMPORTS = ("""\
+""", """\
+""")
+
+ONLY_FUTURE_IMPORTS = ("""\
+from __future__ import print_function
+""", """\
+from __future__ import print_function
+""")
+
+ONLY_NORMAL_IMPORTS = ("""\
+import foo
+""", """\
+from __future__ import absolute_import
+import foo
+""")
+
+NORMAL_AND_FUTURE_IMPORTS = ("""\
+from __future__ import print_function
+import foo
+""", """\
+from __future__ import print_function
+from __future__ import absolute_import
+import foo
+""")
+
+
+def test_no_imports():
+    check_on_input(*NO_IMPORTS)
+
+def test_only_future_imports():
+    check_on_input(*ONLY_FUTURE_IMPORTS)
+
+def test_only_normal_imports():
+    check_on_input(*ONLY_NORMAL_IMPORTS)
+
+def test_normal_and_future_imports():
+    check_on_input(*NORMAL_AND_FUTURE_IMPORTS)

tests/test_fix_imports_six.py

@@ -17,6 +17,7 @@
 import ConfigParser
 ConfigParser.ConfigParser()
 """, """\
+from __future__ import absolute_import
 import six.moves.configparser
 six.moves.configparser.ConfigParser()
 """)
@@ -25,6 +26,7 @@
 from ConfigParser import ConfigParser
 ConfigParser()
 """, """\
+from __future__ import absolute_import
 from six.moves.configparser import ConfigParser
 ConfigParser()
 """)

tests/test_fix_int_long_tuple.py

@@ -6,13 +6,15 @@
 INT_LONG_ISINSTANCE = ("""\
 isinstance(1, (int, long))
 """, """\
+from __future__ import absolute_import
 import six
 isinstance(1, six.integer_types)
 """)
 
 LONG_INT_ISINSTANCE = ("""\
 isinstance(1, (long, int))
 """, """\
+from __future__ import absolute_import
 import six
 isinstance(1, six.integer_types)
 """)