Add an uninstall method to the ImportManager.

This is the accepted portion of patch #402498.

diff --git a/Lib/imputil.py b/Lib/imputil.py
index 2f87d69be97e9224bf2755cf1c62c0bc15cfaf91..b245ec503509d448a6d9abb292c5f4a4362ec75b 100644 (file)
--- a/Lib/imputil.py
+++ b/Lib/imputil.py
@@ -28,12 +28,20 @@ class ImportManager:
         if isinstance(namespace, _ModuleType):
             namespace = vars(namespace)
 
-        ### Note that we have no notion of "uninstall" or "chaining"
+        # Note: we have no notion of "chaining"
 
+        # Record the previous import hook, then install our own.
+        self.previous_importer = namespace['__import__']
+        self.namespace = namespace
         namespace['__import__'] = self._import_hook
+
         ### fix this
         #namespace['reload'] = self._reload_hook
 
+    def uninstall(self):
+        "Restore the previous import mechanism."
+        self.namespace['__import__'] = self.previous_importer
+
     def add_suffix(self, suffix, importFunc):
         assert callable(importFunc)
         self.fs_imp.add_suffix(suffix, importFunc)