Another fix for #1414

diff --git a/Lib/test/test_frozen.py b/Lib/test/test_frozen.py
index 2de253556ac543b153a3e8daae058ceb79057a8f..05e8e8cca6587ef888d9abc7d225d8b11e94fe81 100644 (file)
--- a/Lib/test/test_frozen.py
+++ b/Lib/test/test_frozen.py
@@ -4,7 +4,6 @@ from __future__ import with_statement
 from test.test_support import captured_stdout, run_unittest
 import unittest
 import sys, os
-import warnings
 
 class FrozenTests(unittest.TestCase):
     def test_frozen(self):

diff --git a/Lib/test/test_pkg.py b/Lib/test/test_pkg.py
index 1e32d2c2bb2540ff88741c3939bb527f52b87e49..fde99dc4ff982a0d56dcc20ae1a4c636e2578b96 100644 (file)
--- a/Lib/test/test_pkg.py
+++ b/Lib/test/test_pkg.py
@@ -43,14 +43,18 @@ def fixdir(lst):
 # from package import * (defined in __init__)
 
 
-class Test(unittest.TestCase):
+class TestPkg(unittest.TestCase):
 
     def setUp(self):
         self.root = None
         self.syspath = list(sys.path)
+        self.sysmodules = sys.modules.copy()
 
     def tearDown(self):
         sys.path[:] = self.syspath
+        sys.modules.clear()
+        sys.modules.update(self.sysmodules)
+        del self.sysmodules
         cleanout(self.root)
 
     def run_code(self, code):