Skip to content

bpo-39683: 2to3 fix_exitfunc suggests duplicated import of atexit module #18654

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

Closed
phsilva wants to merge 1 commit into from
Closed

bpo-39683: 2to3 fix_exitfunc suggests duplicated import of atexit module #18654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions Lib/lib2to3/fixes/fix_exitfunc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Author: Benjamin Peterson

from lib2to3 import pytree, fixer_base
from lib2to3.fixer_util import Name, Attr, Call, Comma, Newline, syms
from lib2to3.fixer_util import Name, Attr, Call, Comma, Newline, syms, does_tree_import


class FixExitfunc(fixer_base.BaseFix):
Expand Down Expand Up @@ -55,6 +55,10 @@ def transform(self, node, results):
"import at the top of your file.")
return

# Do not add import if already present (multiple sys.atexit's)
if does_tree_import(None, "atexit", self.sys_import.parent):
return

# Now add an atexit import after the sys import.
names = self.sys_import.children[1]
if names.type == syms.dotted_as_names:
Expand All @@ -63,7 +67,6 @@ def transform(self, node, results):
else:
containing_stmt = self.sys_import.parent
position = containing_stmt.children.index(self.sys_import)
stmt_container = containing_stmt.parent
new_import = pytree.Node(syms.import_name,
[Name("import"), Name("atexit", " ")]
)
Expand Down
18 changes: 18 additions & 0 deletions Lib/lib2to3/tests/test_fixers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4527,6 +4527,24 @@ def test_simple(self):
"""
self.check(b, a)

def test_multiple(self):
b = """
import sys
if 42:
sys.exitfunc = my_atexit
else:
sys.exitfunc = my_otheratexit
"""
a = """
import sys
import atexit
if 42:
atexit.register(my_atexit)
else:
atexit.register(my_otheratexit)
"""
self.check(b, a)

def test_names_import(self):
b = """
import sys, crumbs
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Tools-Demos/2020-02-25-01-08-58.bpo-39683.-fbPik.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
lib2to3: Fix duplicated atexit import when fixing multiple sys.exitfunc.
Patch by Paulo Henrique Silva.