diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-13 16:31:51 +0000 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-13 16:31:51 +0000 |
| commit | ca154091950023d209819484d2d5c51ddcc1e882 (patch) | |
| tree | 17e87f66d5f4a67c87e3e9f016dee4783e67d53a /Lib/test/test_pkg.py | |
| parent | 8f6713f46d774942beb7984792a7a4c8666aab9a (diff) | |
| download | cpython-git-ca154091950023d209819484d2d5c51ddcc1e882.tar.gz | |
Merged revisions 76240 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r76240 | antoine.pitrou | 2009-11-13 17:29:04 +0100 (ven., 13 nov. 2009) | 6 lines
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.
........
Diffstat (limited to 'Lib/test/test_pkg.py')
| -rw-r--r-- | Lib/test/test_pkg.py | 6 |
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 |