Kaydet (Commit) f1465f05 authored tarafından Nick Coghlan's avatar Nick Coghlan

Close #17731: Clean up properly in test_import

üst 26dfaac9
...@@ -43,6 +43,7 @@ def _ready_to_import(name=None, source=""): ...@@ -43,6 +43,7 @@ def _ready_to_import(name=None, source=""):
# sets up a temporary directory and removes it # sets up a temporary directory and removes it
# creates the module file # creates the module file
# temporarily clears the module from sys.modules (if any) # temporarily clears the module from sys.modules (if any)
# reverts or removes the module when cleaning up
name = name or "spam" name = name or "spam"
with script_helper.temp_dir() as tempdir: with script_helper.temp_dir() as tempdir:
path = script_helper.make_script(tempdir, name, source) path = script_helper.make_script(tempdir, name, source)
...@@ -54,6 +55,8 @@ def _ready_to_import(name=None, source=""): ...@@ -54,6 +55,8 @@ def _ready_to_import(name=None, source=""):
finally: finally:
if old_module is not None: if old_module is not None:
sys.modules[name] = old_module sys.modules[name] = old_module
elif name in sys.modules:
del sys.modules[name]
class ImportTests(unittest.TestCase): class ImportTests(unittest.TestCase):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment