[Python-3000-checkins] r58954 - python/branches/py3k/Lib/test/test_frozen.py python/branches/py3k/Lib/test/test_pkg.py

[christian.heimes]

Author: christian.heimes
Date: Mon Nov 12 20:53:03 2007
New Revision: 58954

Modified:
   python/branches/py3k/Lib/test/test_frozen.py
   python/branches/py3k/Lib/test/test_pkg.py
Log:
Another fix for #1414

Modified: python/branches/py3k/Lib/test/test_frozen.py
==============================================================================
--- python/branches/py3k/Lib/test/test_frozen.py	(original)
+++ python/branches/py3k/Lib/test/test_frozen.py	Mon Nov 12 20:53:03 2007
@@ -4,7 +4,6 @@
 from test.test_support import captured_stdout, run_unittest
 import unittest
 import sys, os
-import warnings
 
 class FrozenTests(unittest.TestCase):
     def test_frozen(self):

Modified: python/branches/py3k/Lib/test/test_pkg.py
==============================================================================
--- python/branches/py3k/Lib/test/test_pkg.py	(original)
+++ python/branches/py3k/Lib/test/test_pkg.py	Mon Nov 12 20:53:03 2007
@@ -43,14 +43,18 @@
 # 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):