use touch_import directly from fissix.fixer_util

Author: graingert

.pre-commit-config.yaml

@@ -40,3 +40,15 @@ repos:
     hooks:
       - id: prettier
         args: [--prose-wrap=always, --print-width=88]
+
+  - repo: https://github.com/myint/autoflake
+    rev: v1.4
+    hooks:
+      - id: autoflake
+        exclude: &fixtures tests/functional/|tests/input|tests/extensions/data|tests/regrtest_data/|tests/data/
+        args:
+          - --in-place
+          - --remove-all-unused-imports
+          - --expand-star-imports
+          - --remove-duplicate-keys
+          - --remove-unused-variables

libmodernize/__init__.py

@@ -84,10 +84,6 @@ def add_future(node, symbol):
     root.insert_child(idx, Node(syms.simple_stmt, children))
 
 
-def touch_import(package, name, node):
-    fixer_util.touch_import(package, name, node)
-
-
 def is_listcomp(node):
     def _is_listcomp(node):
         return (

libmodernize/fixes/fix_basestring.py

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

libmodernize/fixes/fix_dict_six.py

@@ -8,14 +8,12 @@
 from fissix import fixer_util, pytree
 from fissix.fixes import fix_dict
 
-import libmodernize
-
 
 class FixDictSix(fix_dict.FixDict):
     def transform_iter(self, node, results):
         """Call six.(iter|view)items() and friends."""
         # Make sure six is imported.
-        libmodernize.touch_import(None, "six", node)
+        fixer_util.touch_import(None, "six", node)
 
         # Copy of self.transform() from fissix.fix_dict with some changes to
         # use the six.* methods.

libmodernize/fixes/fix_filter.py

@@ -3,6 +3,7 @@
 
 from __future__ import generator_stop
 
+from fissix import fixer_util
 from fissix.fixes import fix_filter
 
 import libmodernize
@@ -17,5 +18,5 @@ def transform(self, node, results):
         if not libmodernize.is_listcomp(result):
             # Keep performance improvement from six.moves.filter in iterator
             # contexts on Python 2.7.
-            libmodernize.touch_import("six.moves", "filter", node)
+            fixer_util.touch_import("six.moves", "filter", node)
         return result

libmodernize/fixes/fix_input_six.py

@@ -10,11 +10,9 @@
 
 from __future__ import generator_stop
 
-from fissix import fixer_base
+from fissix import fixer_base, fixer_util
 from fissix.fixer_util import Call, Name
 
-import libmodernize
-
 
 class FixInputSix(fixer_base.ConditionalFix):
 
@@ -31,7 +29,7 @@ def transform(self, node, results):
         if self.should_skip(node):
             return
 
-        libmodernize.touch_import("six.moves", "input", node)
+        fixer_util.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,8 +2,6 @@
 
 from fissix import fixer_base, fixer_util
 
-import libmodernize
-
 
 class FixIntLongTuple(fixer_base.BaseFix):
 
@@ -17,6 +15,6 @@ class FixIntLongTuple(fixer_base.BaseFix):
     """
 
     def transform(self, node, results):
-        libmodernize.touch_import(None, "six", node)
+        fixer_util.touch_import(None, "six", node)
         pair = results["pair"]
         pair.replace(fixer_util.Name("six.integer_types", prefix=pair.prefix))

libmodernize/fixes/fix_itertools_imports_six.py

@@ -3,11 +3,9 @@
 from __future__ import generator_stop
 
 # Local imports
-from fissix import fixer_base
+from fissix import fixer_base, fixer_util
 from fissix.fixer_util import BlankLine, syms, token
 
-import libmodernize
-
 # This is a derived work of Lib/lib2to3/fixes/fix_itertools_imports.py. That file
 # is under the copyright of the Python Software Foundation and licensed
 # under the Python Software Foundation License 2.
@@ -50,7 +48,7 @@ def transform(self, node, results):
                 "izip_longest",
             ):
                 child.value = None
-                libmodernize.touch_import("six.moves", member_name[1:], node)
+                fixer_util.touch_import("six.moves", member_name[1:], node)
                 child.remove()
 
         # Make sure the import statement is still sane

libmodernize/fixes/fix_itertools_six.py

@@ -16,11 +16,9 @@
 from __future__ import generator_stop
 
 # Local imports
-from fissix import fixer_base
+from fissix import fixer_base, fixer_util
 from fissix.fixer_util import Name
 
-import libmodernize
-
 
 class FixItertoolsSix(fixer_base.BaseFix):
     BM_compatible = True
@@ -50,7 +48,7 @@ def transform(self, node, results):
             # function (to be consistant with the second part of the pattern)
             dot.remove()
             func.parent.replace(func)
-            libmodernize.touch_import("six.moves", func.value[1:], node)
+            fixer_util.touch_import("six.moves", func.value[1:], node)
 
         prefix = prefix or func.prefix
         func.replace(Name(func.value[1:], prefix=prefix))

libmodernize/fixes/fix_map.py

@@ -3,6 +3,7 @@
 
 from __future__ import generator_stop
 
+from fissix import fixer_util
 from fissix.fixes import fix_map
 
 import libmodernize
@@ -17,5 +18,5 @@ def transform(self, node, results):
         if not libmodernize.is_listcomp(result):
             # Always use the import even if no change is required so as to have
             # improved performance in iterator contexts even on Python 2.7.
-            libmodernize.touch_import("six.moves", "map", node)
+            fixer_util.touch_import("six.moves", "map", node)
         return result