From: Tim Peters <tim.peters@gmail.com>
Date: Wed, 4 Aug 2004 02:29:12 +0000 (+0000)
Subject: ihooks FancyModuleLoader.load_module()
X-Git-Tag: v2.4a2~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d3cfdb4994ed672436e3e16b66ac1b9349543db;p=python

ihooks FancyModuleLoader.load_module()
imputils Importer._process_result():
    remove name from modules dict if exec fails.

This is what all the builtin importers do now, new in 2.4.
---

diff --git a/Lib/ihooks.py b/Lib/ihooks.py
index 936a950de0..f5b93ab9cf 100644
--- a/Lib/ihooks.py
+++ b/Lib/ihooks.py
@@ -322,7 +322,13 @@ class FancyModuleLoader(ModuleLoader):
         if path:
             m.__path__ = path
         m.__file__ = filename
-        exec code in m.__dict__
+        try:
+            exec code in m.__dict__
+        except:
+            d = self.hooks.modules_dict()
+            if name in d:
+                del d[name]
+            raise
         return m
 
 
diff --git a/Lib/imputil.py b/Lib/imputil.py
index 04111dcaa6..e6ad7ecac4 100644
--- a/Lib/imputil.py
+++ b/Lib/imputil.py
@@ -297,7 +297,12 @@ class Importer:
 
         # execute the code within the module's namespace
         if not is_module:
-            exec code in module.__dict__
+            try:
+                exec code in module.__dict__
+            except:
+                if fqname in sys.modules:
+                    del sys.modules[fqname]
+                raise
 
         # fetch from sys.modules instead of returning module directly.
         # also make module's __name__ agree with fqname, in case