Skip to content

Commit 349cc27

Browse files
[3.12] gh-123780: Make test_pkgutil clean up spam module (GH-123036) (GH-123782)
(cherry picked from commit eca3fe4) Co-authored-by: Malcolm Smith <[email protected]>
1 parent 77bb146 commit 349cc27

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

Lib/test/test_pkgutil.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -624,8 +624,11 @@ def test_get_loader_handles_missing_spec_attribute(self):
624624
mod = type(sys)(name)
625625
del mod.__spec__
626626
with CleanImport(name):
627-
sys.modules[name] = mod
628-
loader = pkgutil.get_loader(name)
627+
try:
628+
sys.modules[name] = mod
629+
loader = pkgutil.get_loader(name)
630+
finally:
631+
sys.modules.pop(name, None)
629632
self.assertIsNone(loader)
630633

631634
@ignore_warnings(category=DeprecationWarning)
@@ -634,8 +637,11 @@ def test_get_loader_handles_spec_attribute_none(self):
634637
mod = type(sys)(name)
635638
mod.__spec__ = None
636639
with CleanImport(name):
637-
sys.modules[name] = mod
638-
loader = pkgutil.get_loader(name)
640+
try:
641+
sys.modules[name] = mod
642+
loader = pkgutil.get_loader(name)
643+
finally:
644+
sys.modules.pop(name, None)
639645
self.assertIsNone(loader)
640646

641647
@ignore_warnings(category=DeprecationWarning)

0 commit comments

Comments
 (0)