* Allow Christian's InitializePreload() to run sooner so that the default CLRModule.preload (true in an interactive session) can be cleared before loading any "real" framework assemblies interactively.

Barton Cline · Barton Cline · commit 5d9d65dd735a · 2011-01-01T22:41:23.000Z
* Also applying a slightly cleaner version of the ImpHookOnlyImpError patch of 2010-12-19
diff --git a/pythonnet/src/runtime/importhook.cs b/pythonnet/src/runtime/importhook.cs
@@ -98,6 +98,21 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw) {
             }
 
             string mod_name = Runtime.GetManagedString(py_mod_name);
+            // Check these BEFORE the built-in import runs; may as well
+            // do the Incref()ed return here, since we've already found
+            // the module.
+            if (mod_name == "clr") {
+                root.InitializePreload();
+                Runtime.Incref(root.pyHandle);
+                return root.pyHandle;
+            }
+            if (mod_name == "CLR") {
+                Exceptions.deprecation("The CLR module is deprecated. " +
+                    "Please use 'clr'.");
+                root.InitializePreload();
+                Runtime.Incref(root.pyHandle);
+                return root.pyHandle;
+            }
             // 2010-08-15: Always seemed smart to let python try first...
             // This shaves off a few tenths of a second on test_module.py
             // and works around a quirk where 'sys' is found by the 
@@ -107,23 +122,16 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw) {
             // little sense to me.
             IntPtr res = Runtime.PyObject_Call(py_import, args, kw);
             if (res != IntPtr.Zero) {
+                // There was no error.
                 return res;
             }
-            Exceptions.Clear();
-
-            if (mod_name == "CLR") {
-                Exceptions.deprecation("The CLR module is deprecated. " +
-                    "Please use 'clr'.");
-                root.InitializePreload();
-                Runtime.Incref(root.pyHandle);
-                return root.pyHandle;
-            }
-
-            if (mod_name == "clr") {
-                root.InitializePreload();
-                Runtime.Incref(root.pyHandle);
-                return root.pyHandle;
+            // There was an error
+            if (!Exceptions.ExceptionMatches(Exceptions.ImportError)) {
+                // and it was NOT an ImportError; bail out here.
+                return IntPtr.Zero;
             }
+            // Otherwise,  just clear the it.
+            Exceptions.Clear();
 
             string realname = mod_name;
             if (mod_name.StartsWith("CLR.")) {
