From: Nick Coghlan <ncoghlan@gmail.com>
Date: Mon, 15 Apr 2013 12:56:51 +0000 (+1000)
Subject: Close #17731: Clean up properly in test_import
X-Git-Tag: v3.3.2~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1465f0535ee64ee4bdcabe332c28943f579c672;p=thirdparty%2FPython%2Fcpython.git

Close #17731: Clean up properly in test_import
---

diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
index 81ddf4533078..470a6d23927d 100644
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -43,6 +43,7 @@ def _ready_to_import(name=None, source=""):
     # sets up a temporary directory and removes it
     # creates the module file
     # temporarily clears the module from sys.modules (if any)
+    # reverts or removes the module when cleaning up
     name = name or "spam"
     with script_helper.temp_dir() as tempdir:
         path = script_helper.make_script(tempdir, name, source)
@@ -54,6 +55,8 @@ def _ready_to_import(name=None, source=""):
         finally:
             if old_module is not None:
                 sys.modules[name] = old_module
+            elif name in sys.modules:
+                del sys.modules[name]
 
 
 class ImportTests(unittest.TestCase):