From db4a2ef23a730a518f34310ff53d9540324b2d95 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Mon, 12 Nov 2007 19:53:03 +0000
Subject: [PATCH] Another fix for #1414

---
 Lib/test/test_frozen.py | 1 -
 Lib/test/test_pkg.py    | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_frozen.py b/Lib/test/test_frozen.py
index 2de253556ac..05e8e8cca65 100644
--- 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 1e32d2c2bb2..fde99dc4ff9 100644
--- 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):