Merge remote-tracking branch 'upstream/master' into fix_long_call

Author: brettcannon

__main__.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from libmodernize import main
 
 if __name__ == '__main__':

libmodernize/__init__.py

@@ -1,4 +1,6 @@
-from lib2to3.fixer_util import FromImport, Newline, find_root
+from __future__ import absolute_import
+
+from lib2to3 import fixer_util
 from lib2to3.pytree import Leaf, Node
 from lib2to3.pygram import python_symbols as syms
 from lib2to3.pgen2 import token
@@ -41,7 +43,7 @@ def check_future_import(node):
 
 def add_future(node, symbol):
 
-    root = find_root(node)
+    root = fixer_util.find_root(node)
 
     for idx, node in enumerate(root.children):
         if node.type == syms.simple_stmt and \
@@ -56,6 +58,12 @@ def add_future(node, symbol):
             # already imported
             return
 
-    import_ = FromImport('__future__', [Leaf(token.NAME, symbol, prefix=" ")])
-    children = [import_, Newline()]
+    import_ = fixer_util.FromImport('__future__',
+                                    [Leaf(token.NAME, symbol, prefix=" ")])
+    children = [import_, fixer_util.Newline()]
     root.insert_child(idx, Node(syms.simple_stmt, children))
+
+
+def touch_import(package, name, node):
+    add_future(node, 'absolute_import')
+    fixer_util.touch_import(package, name, node)

libmodernize/fixes/__init__.py

@@ -8,7 +8,6 @@
     'lib2to3.fixes.fix_funcattrs',
     'lib2to3.fixes.fix_has_key',
     'lib2to3.fixes.fix_idioms',
-    'lib2to3.fixes.fix_import',
     'lib2to3.fixes.fix_long',
     'lib2to3.fixes.fix_methodattrs',
     'lib2to3.fixes.fix_ne',

libmodernize/fixes/fix_basestring.py

@@ -1,11 +1,14 @@
+from __future__ import absolute_import
+
 from lib2to3 import fixer_base
-from lib2to3.fixer_util import touch_import, Name
+from lib2to3 import fixer_util
+import libmodernize
 
 
 class FixBasestring(fixer_base.BaseFix):
     BM_compatible = True
     PATTERN = """'basestring'"""
 
     def transform(self, node, results):
-        touch_import(None, u'six', node)
-        return Name(u'six.string_types', prefix=node.prefix)
+        libmodernize.touch_import(None, u'six', node)
+        return fixer_util.Name(u'six.string_types', prefix=node.prefix)

libmodernize/fixes/fix_dict_six.py

@@ -1,10 +1,12 @@
 """Fixer for iterkeys() -> six.iterkeys(), and similarly for iteritems and itervalues."""
+from __future__ import absolute_import
 
 # Local imports
 from lib2to3 import fixer_base
 from lib2to3 import fixer_util
 from lib2to3 import patcomp
 from lib2to3.fixes import fix_dict
+import libmodernize
 
 
 class FixDictSix(fix_dict.FixDict):
@@ -13,7 +15,7 @@ def transform_iter(self, method_name, node, base):
         """Call six.iteritems() and friends."""
         if method_name.startswith(u'view'):
             method_name = u'iter' + method_name[4:]
-        fixer_util.touch_import(None, u'six', node)
+        libmodernize.touch_import(None, u'six', node)
         new_node = [n.clone() for n in base]
         new_node[0].prefix = u''
         name = fixer_util.Name(u'six.' + method_name, prefix=node.prefix)

libmodernize/fixes/fix_file.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from lib2to3 import fixer_base
 from lib2to3.fixer_util import Name
 
@@ -6,7 +8,7 @@ class FixFile(fixer_base.BaseFix):
 
     BM_compatible = True
     order = 'pre'
-    
+
     PATTERN = """
     power< name='file'
         trailer<

libmodernize/fixes/fix_filter.py

@@ -1,8 +1,10 @@
 # Copyright 2008 Armin Ronacher.
 # Licensed to PSF under a Contributor Agreement.
+from __future__ import absolute_import
 
 from lib2to3 import fixer_base
-from lib2to3.fixer_util import Call, Name, touch_import, in_special_context
+from lib2to3.fixer_util import Call, Name, in_special_context
+from libmodernize import touch_import
 
 
 class FixFilter(fixer_base.ConditionalFix):

libmodernize/fixes/fix_import.py

@@ -0,0 +1,18 @@
+from __future__ import absolute_import
+
+from lib2to3.fixes import fix_import
+import libmodernize
+
+
+class FixImport(fix_import.FixImport):
+
+    # Make sure this runs before any other fixer to guarantee that any other
+    # added absolute_import doesn't block this fixer's execution.
+    run_order = 1
+
+    def transform(self, node, results):
+        results = super(FixImport, self).transform(node, results)
+        if results is None:
+            return
+        libmodernize.add_future(node, 'absolute_import')
+        return results

libmodernize/fixes/fix_input_six.py

@@ -7,9 +7,11 @@
 #
 #     Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #     2011, 2012, 2013, 2014 Python Software Foundation. All rights reserved.
+from __future__ import absolute_import
 
 from lib2to3 import fixer_base
-from lib2to3.fixer_util import Call, Name, touch_import
+from lib2to3.fixer_util import Call, Name
+from libmodernize import touch_import
 
 
 class FixInputSix(fixer_base.ConditionalFix):

libmodernize/fixes/fix_map.py

@@ -1,8 +1,10 @@
 # Copyright 2008 Armin Ronacher.
 # Licensed to PSF under a Contributor Agreement.
+from __future__ import absolute_import
 
 from lib2to3 import fixer_base
-from lib2to3.fixer_util import Call, Name, touch_import, in_special_context
+from lib2to3.fixer_util import Call, Name, in_special_context
+from libmodernize import touch_import
 
 
 class FixMap(fixer_base.ConditionalFix):