Skip to content

fixed undefined variable children_hooks + imports cleanup #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edschofield merged 2 commits into from
Feb 21, 2024
+4 −6
Merged

fixed undefined variable children_hooks + imports cleanup #348

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb78692
fixed undefined variable children_hooks + imports cleanup
Jul 16, 2018
ab03dfc
Merge branch 'master' into bugfix-touch_import_top
omit66 Jul 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/libfuturize/fixer_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
"""

from lib2to3.fixer_util import (FromImport, Newline, is_import,
find_root, does_tree_import, Comma)
find_root, does_tree_import,
Call, Name, Comma)
from lib2to3.pytree import Leaf, Node
from lib2to3.pygram import python_symbols as syms, python_grammar
from lib2to3.pygram import python_symbols as syms
from lib2to3.pygram import token
from lib2to3.fixer_util import (Node, Call, Name, syms, Comma, Number)
import re


Expand Down Expand Up @@ -390,6 +390,7 @@ def touch_import_top(package, name_to_import, node):
break
insert_pos = idx

children_hooks = []
if package is None:
import_ = Node(syms.import_name, [
Leaf(token.NAME, u"import"),
Expand All @@ -413,8 +414,6 @@ def touch_import_top(package, name_to_import, node):
]
)
children_hooks = [install_hooks, Newline()]
else:
children_hooks = []

# FromImport(package, [Leaf(token.NAME, name_to_import, prefix=u" ")])

Expand Down Expand Up @@ -448,7 +447,6 @@ def check_future_import(node):
else:
node = node.children[3]
# now node is the import_as_name[s]
# print(python_grammar.number2symbol[node.type]) # breaks sometimes
if node.type == syms.import_as_names:
result = set()
for n in node.children:
Expand Down