Issue #6551: test_zipimport could import and then destroy some modules of

the encodings package, which would make other tests fail further down
the road because the internally cached encoders and decoders would point
to empty global variables.

1 files changed, 2 insertions, 4 deletions

diff --git a/Lib/test/test_pkg.py b/Lib/test/test_pkg.py
index 0c568bb3b5..2e293f4fbe 100644
--- a/Lib/test/test_pkg.py
+++ b/Lib/test/test_pkg.py
@@ -48,13 +48,11 @@ class TestPkg(unittest.TestCase):
         self.root = None
         self.pkgname = None
         self.syspath = list(sys.path)
-        self.sysmodules = sys.modules.copy()
+        self.modules_before = support.modules_setup()
 
     def tearDown(self):
         sys.path[:] = self.syspath
-        sys.modules.clear()
-        sys.modules.update(self.sysmodules)
-        del self.sysmodules
+        support.modules_cleanup(*self.modules_before)
         cleanout(self.root)
 
         # delete all modules concerning the tested hiearchy