empty libmodernize/__init__.py

Author: graingert

libmodernize/__init__.py

@@ -1,113 +1,3 @@
 from __future__ import generator_stop
 
-from fissix import fixer_util
-from fissix.pgen2 import token
-from fissix.pygram import python_symbols as syms
-from fissix.pytree import Leaf, Node
-
 __version__ = "0.8.1.dev0"
-
-
-def _check_future_import(node):
-    """If this is a future import, return set of symbols that are imported,
-    else return None."""
-    # node should be the import statement here
-    if not (node.type == syms.simple_stmt and node.children):
-        return set()
-    node = node.children[0]
-    # now node is the import_from node
-    if not (
-        node.type == syms.import_from
-        and node.children[1].type == token.NAME
-        and node.children[1].value == "__future__"
-    ):
-        return set()
-
-    if node.children[3].type == token.LPAR:
-        # from __future__ import (..
-        node = node.children[4]
-    else:
-        # from __future__ import ...
-        node = node.children[3]
-    # now node is the import_as_name[s]
-
-    # print(python_grammar.number2symbol[node.type])
-    if node.type == syms.import_as_names:
-        result = set()
-        for n in node.children:
-            if n.type == token.NAME:
-                result.add(n.value)
-            elif n.type == syms.import_as_name:
-                n = n.children[0]
-                assert n.type == token.NAME
-                result.add(n.value)
-        return result
-    elif node.type == syms.import_as_name:
-        node = node.children[0]
-        assert node.type == token.NAME
-        return {node.value}
-    elif node.type == token.NAME:
-        return {node.value}
-    else:  # pragma: no cover
-        assert 0, "strange import"
-
-
-def add_future(node, symbol):
-
-    root = fixer_util.find_root(node)
-
-    for idx, node in enumerate(root.children):
-        if (
-            node.type == syms.simple_stmt
-            and len(node.children) > 0
-            and node.children[0].type == token.STRING
-        ):
-            # skip over docstring
-            continue
-        names = _check_future_import(node)
-        if not names:
-            # not a future statement; need to insert before this
-            break
-        if symbol in names:
-            # already imported
-            return
-
-    import_ = fixer_util.FromImport(
-        "__future__", [Leaf(token.NAME, symbol, prefix=" ")]
-    )
-
-    # Place after any comments or whitespace. (copyright, shebang etc.)
-    import_.prefix = node.prefix
-    node.prefix = ""
-
-    children = [import_, fixer_util.Newline()]
-    root.insert_child(idx, Node(syms.simple_stmt, children))
-
-
-def is_listcomp(node):
-    def _is_listcomp(node):
-        return (
-            isinstance(node, Node)
-            and node.type == syms.atom
-            and len(node.children) >= 2
-            and isinstance(node.children[0], Leaf)
-            and node.children[0].value == "["
-            and isinstance(node.children[-1], Leaf)
-            and node.children[-1].value == "]"
-        )
-
-    def _is_noop_power_node(node):
-        """https://github.com/python/cpython/pull/2235 changed the node
-        structure for fix_map / fix_filter to contain a top-level `power` node
-        """
-        return (
-            isinstance(node, Node)
-            and node.type == syms.power
-            and len(node.children) == 1
-        )
-
-    return (
-        _is_listcomp(node)
-        or _is_noop_power_node(node)
-        and _is_listcomp(node.children[0])
-    )

libmodernize/fixes/fix_classic_division.py

@@ -3,7 +3,7 @@
 from fissix import fixer_base, pytree
 from fissix.pgen2 import token
 
-import libmodernize
+from .. import utils
 
 
 class FixClassicDivision(fixer_base.BaseFix):
@@ -21,7 +21,7 @@ def match(self, node):
     def transform(self, node, results):
         if self.skip:
             return
-        libmodernize.add_future(node, "division")
+        utils.add_future(node, "division")
 
         if node.value == "/":
             return pytree.Leaf(token.DOUBLESLASH, "//", prefix=node.prefix)

libmodernize/fixes/fix_filter.py

@@ -6,7 +6,7 @@
 from fissix import fixer_util
 from fissix.fixes import fix_filter
 
-import libmodernize
+from .. import utils
 
 
 class FixFilter(fix_filter.FixFilter):
@@ -15,7 +15,7 @@ class FixFilter(fix_filter.FixFilter):
 
     def transform(self, node, results):
         result = super().transform(node, results)
-        if not libmodernize.is_listcomp(result):
+        if not utils.is_listcomp(result):
             # Keep performance improvement from six.moves.filter in iterator
             # contexts on Python 2.7.
             fixer_util.touch_import("six.moves", "filter", node)

libmodernize/fixes/fix_import.py

@@ -3,7 +3,7 @@
 from fissix.fixer_util import syms
 from fissix.fixes import fix_import
 
-import libmodernize
+from .. import utils
 
 
 class FixImport(fix_import.FixImport):
@@ -23,5 +23,5 @@ def transform(self, node, results):
             return
 
         # If there are any non-future imports, add absolute_import
-        libmodernize.add_future(node, "absolute_import")
+        utils.add_future(node, "absolute_import")
         return super().transform(node, results)

libmodernize/fixes/fix_map.py

@@ -6,7 +6,7 @@
 from fissix import fixer_util
 from fissix.fixes import fix_map
 
-import libmodernize
+from .. import utils
 
 
 class FixMap(fix_map.FixMap):
@@ -15,7 +15,7 @@ class FixMap(fix_map.FixMap):
 
     def transform(self, node, results):
         result = super().transform(node, results)
-        if not libmodernize.is_listcomp(result):
+        if not utils.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.
             fixer_util.touch_import("six.moves", "map", node)

libmodernize/fixes/fix_print.py

@@ -2,11 +2,11 @@
 
 from fissix.fixes import fix_print
 
-import libmodernize
+from .. import utils
 
 
 class FixPrint(fix_print.FixPrint):
     def transform(self, node, results):
         result = super().transform(node, results)
-        libmodernize.add_future(node, "print_function")
+        utils.add_future(node, "print_function")
         return result

libmodernize/fixes/fix_unicode_future.py

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

libmodernize/utils.py

@@ -0,0 +1,111 @@
+from __future__ import generator_stop
+
+from fissix import fixer_util
+from fissix.pgen2 import token
+from fissix.pygram import python_symbols as syms
+from fissix.pytree import Leaf, Node
+
+
+def _check_future_import(node):
+    """If this is a future import, return set of symbols that are imported,
+    else return None."""
+    # node should be the import statement here
+    if not (node.type == syms.simple_stmt and node.children):
+        return set()
+    node = node.children[0]
+    # now node is the import_from node
+    if not (
+        node.type == syms.import_from
+        and node.children[1].type == token.NAME
+        and node.children[1].value == "__future__"
+    ):
+        return set()
+
+    if node.children[3].type == token.LPAR:
+        # from __future__ import (..
+        node = node.children[4]
+    else:
+        # from __future__ import ...
+        node = node.children[3]
+    # now node is the import_as_name[s]
+
+    # print(python_grammar.number2symbol[node.type])
+    if node.type == syms.import_as_names:
+        result = set()
+        for n in node.children:
+            if n.type == token.NAME:
+                result.add(n.value)
+            elif n.type == syms.import_as_name:
+                n = n.children[0]
+                assert n.type == token.NAME
+                result.add(n.value)
+        return result
+    elif node.type == syms.import_as_name:
+        node = node.children[0]
+        assert node.type == token.NAME
+        return {node.value}
+    elif node.type == token.NAME:
+        return {node.value}
+    else:  # pragma: no cover
+        assert 0, "strange import"
+
+
+def add_future(node, symbol):
+
+    root = fixer_util.find_root(node)
+
+    for idx, node in enumerate(root.children):
+        if (
+            node.type == syms.simple_stmt
+            and len(node.children) > 0
+            and node.children[0].type == token.STRING
+        ):
+            # skip over docstring
+            continue
+        names = _check_future_import(node)
+        if not names:
+            # not a future statement; need to insert before this
+            break
+        if symbol in names:
+            # already imported
+            return
+
+    import_ = fixer_util.FromImport(
+        "__future__", [Leaf(token.NAME, symbol, prefix=" ")]
+    )
+
+    # Place after any comments or whitespace. (copyright, shebang etc.)
+    import_.prefix = node.prefix
+    node.prefix = ""
+
+    children = [import_, fixer_util.Newline()]
+    root.insert_child(idx, Node(syms.simple_stmt, children))
+
+
+def is_listcomp(node):
+    def _is_listcomp(node):
+        return (
+            isinstance(node, Node)
+            and node.type == syms.atom
+            and len(node.children) >= 2
+            and isinstance(node.children[0], Leaf)
+            and node.children[0].value == "["
+            and isinstance(node.children[-1], Leaf)
+            and node.children[-1].value == "]"
+        )
+
+    def _is_noop_power_node(node):
+        """https://github.com/python/cpython/pull/2235 changed the node
+        structure for fix_map / fix_filter to contain a top-level `power` node
+        """
+        return (
+            isinstance(node, Node)
+            and node.type == syms.power
+            and len(node.children) == 1
+        )
+
+    return (
+        _is_listcomp(node)
+        or _is_noop_power_node(node)
+        and _is_listcomp(node.children[0])
+    )