import libmodernize consistently

Author: graingert

libmodernize/fixes/fix_input_six.py

@@ -13,7 +13,7 @@
 from fissix import fixer_base
 from fissix.fixer_util import Call, Name
 
-from libmodernize import touch_import
+import libmodernize
 
 
 class FixInputSix(fixer_base.ConditionalFix):
@@ -31,7 +31,7 @@ def transform(self, node, results):
         if self.should_skip(node):
             return
 
-        touch_import("six.moves", "input", node)
+        libmodernize.touch_import("six.moves", "input", node)
         name = results["name"]
         if name.value == "raw_input":
             name.replace(Name("input", prefix=name.prefix))

libmodernize/fixes/fix_int_long_tuple.py

@@ -2,7 +2,7 @@
 
 from fissix import fixer_base, fixer_util
 
-from libmodernize import touch_import
+import libmodernize
 
 
 class FixIntLongTuple(fixer_base.BaseFix):
@@ -17,6 +17,6 @@ class FixIntLongTuple(fixer_base.BaseFix):
     """
 
     def transform(self, node, results):
-        touch_import(None, "six", node)
+        libmodernize.touch_import(None, "six", node)
         pair = results["pair"]
         pair.replace(fixer_util.Name("six.integer_types", prefix=pair.prefix))

libmodernize/fixes/fix_metaclass.py

@@ -29,7 +29,7 @@
 from fissix.fixer_util import Call, Comma, Leaf, Name, Node, syms
 from fissix.pygram import token
 
-from libmodernize import touch_import
+import libmodernize
 
 # Author: Jack Diederich, Daniel Neuhäuser
 
@@ -198,7 +198,7 @@ def transform(self, node, results):
         else:
             raise ValueError("Unexpected class definition")  # pragma: no cover
 
-        touch_import(None, "six", node)
+        libmodernize.touch_import(None, "six", node)
 
         metaclass = last_metaclass.children[0].children[2].clone()
         metaclass.prefix = ""

libmodernize/fixes/fix_raise_six.py

@@ -10,7 +10,7 @@
 from fissix import fixer_base
 from fissix.fixer_util import Call, Comma, Name
 
-from libmodernize import touch_import
+import libmodernize
 
 
 class FixRaiseSix(fixer_base.BaseFix):
@@ -28,7 +28,7 @@ def transform(self, node, results):
         exc.prefix = ""
         val.prefix = tb.prefix = " "
 
-        touch_import(None, "six", node)
+        libmodernize.touch_import(None, "six", node)
         return Call(
             Name("six.reraise"), [exc, Comma(), val, Comma(), tb], prefix=node.prefix
         )

libmodernize/fixes/fix_unicode.py

@@ -5,7 +5,7 @@
 from fissix import fixer_base
 from fissix.fixer_util import Call, Name
 
-from libmodernize import touch_import
+import libmodernize
 
 _mapping = {"unichr": "chr", "unicode": "str"}
 _literal_re = re.compile("[uU][rR]?[\\'\\\"]")
@@ -17,7 +17,7 @@ class FixUnicode(fixer_base.BaseFix):
 
     def transform(self, node, results):
         if _literal_re.match(node.value):
-            touch_import(None, "six", node)
+            libmodernize.touch_import(None, "six", node)
             new = node.clone()
             new.value = new.value[1:]
             new.prefix = ""

libmodernize/fixes/fix_unicode_future.py

@@ -2,12 +2,12 @@
 
 from fissix.fixes import fix_unicode
 
-from libmodernize import add_future
+import libmodernize
 
 
 class FixUnicodeFuture(fix_unicode.FixUnicode):
     def transform(self, node, results):
         res = super().transform(node, results)
         if res:
-            add_future(node, "unicode_literals")
+            libmodernize.add_future(node, "unicode_literals")
         return res

libmodernize/fixes/fix_xrange_six.py

@@ -6,7 +6,7 @@
 from fissix import fixer_base
 from fissix.fixes import fix_xrange
 
-from libmodernize import touch_import
+import libmodernize
 
 
 class FixXrangeSix(fixer_base.ConditionalFix, fix_xrange.FixXrange):
@@ -16,5 +16,5 @@ class FixXrangeSix(fixer_base.ConditionalFix, fix_xrange.FixXrange):
     def transform(self, node, results):
         if self.should_skip(node):
             return
-        touch_import("six.moves", "range", node)
+        libmodernize.touch_import("six.moves", "range", node)
         return super().transform(node, results)