Merge branch 'master' of https://github.com/PythonCharmers/python-future

edschofield · edschofield · commit cd717bedc78c · 2024-02-21T15:01:26.000+11:00
diff --git a/src/libfuturize/fixer_util.py b/src/libfuturize/fixer_util.py
@@ -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"),
@@ -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" ")])
 

Original file line number	Diff line number	Diff line change
`@@ -390,6 +390,7 @@ def touch_import_top(package, name_to_import, node):`
`390`	`390`	`break`
`391`	`391`	`insert_pos = idx`
`392`	`392`
	`393`	`+ children_hooks = []`
`393`	`394`	`if package is None:`
`394`	`395`	`import_ = Node(syms.import_name, [`
`395`	`396`	`Leaf(token.NAME, u"import"),`
`@@ -413,8 +414,6 @@ def touch_import_top(package, name_to_import, node):`
`413`	`414`	`]`
`414`	`415`	`)`
`415`	`416`	`children_hooks = [install_hooks, Newline()]`
`416`		`- else:`
`417`		`- children_hooks = []`
`418`	`417`
`419`	`418`	`# FromImport(package, [Leaf(token.NAME, name_to_import, prefix=u" ")])`
`420`	`419`