Do a better job of ensuring test reproducibility and clean up.

warsaw · warsaw · commit d3405437171c · 2012-11-20T17:05:41.000-05:00
diff --git a/Lib/test/test_importlib/import_/test_path.py b/Lib/test/test_importlib/import_/test_path.py
@@ -98,13 +98,18 @@ def test_None_on_sys_path(self):
         new_path_hooks = [zipimport.zipimporter,
                           _bootstrap.FileFinder.path_hook(
                               *_bootstrap._get_supported_file_loaders())]
-        with util.uncache('email'):
+        missing = object()
+        email = sys.modules.pop('email', missing)
+        try:
             with util.import_state(meta_path=sys.meta_path[:],
                                    path=new_path,
                                    path_importer_cache=new_path_importer_cache,
                                    path_hooks=new_path_hooks):
                 module = import_module('email')
                 self.assertIsInstance(module, ModuleType)
+        finally:
+            if email is not missing:
+                sys.modules['email'] = email
 
 
 def test_main():
