cleanup and changelog entry

BadSingleton · BadSingleton · commit f92e95b39dc6 · 2021-06-02T10:56:47.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -50,6 +50,7 @@ One must now either use enum members (e.g. `MyEnum.Option`), or use enum constru
 -   .NET and Python exceptions are preserved when crossing Python/.NET boundary
 -   BREAKING: custom encoders are no longer called for instances of `System.Type`
 -   `PythonException.Restore` no longer clears `PythonException` instance.
+-   Replaced the old `__import__` hook hack with a PEP302-style Meta Path Loader
 
 ### Fixed
 
@@ -72,6 +73,7 @@ One must now either use enum members (e.g. `MyEnum.Option`), or use enum constru
 -   Providing an invalid type parameter to a generic type or method produces a helpful Python error
 -   Empty parameter names (as can be generated from F#) do not cause crashes
 
+
 ### Removed
 
 -   implicit assembly loading (you have to explicitly `clr.AddReference` before doing import)
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -8,9 +8,7 @@ namespace Python.Runtime
     /// </summary>
     internal static class ImportHook
     {
-        private static IntPtr py_import;
         private static CLRModule root;
-        private static MethodWrapper hook;
         private static IntPtr py_clr_module;
         static BorrowedReference ClrModuleReference => new BorrowedReference(py_clr_module);
 
@@ -25,20 +23,13 @@ def __init__(self):
 
     @classmethod
     def exec_module(klass, mod):
-        # this method is needed to mark this
-        # loader as a non-legacy loader.
+        # This method needs to exist.
         pass
 
     @classmethod
     def create_module(klass, spec):
         import clr
-        a = clr._LoadClrModule(spec)
-        #mod = getattr(clr, '__imported')
-        print(a)
-        #print(mod)
-        #print(mod is a)
-        #delattr(clr, '__imported')
-        return a
+        return clr._LoadClrModule(spec)
 
 class DotNetFinder(importlib.abc.MetaPathFinder):
     
@@ -49,9 +40,7 @@ def __init__(self):
     @classmethod
     def find_spec(klass, fullname, paths=None, target=None): 
         import clr
-        # print(clr._availableNamespaces)
         if (hasattr(clr, '_availableNamespaces') and fullname in clr._availableNamespaces):
-        #if (clr._NamespaceLoaded(fullname)):
             return importlib.machinery.ModuleSpec(fullname, DotNetLoader(), is_package=True)
         return None
 
diff --git a/src/runtime/moduleobject.cs b/src/runtime/moduleobject.cs
@@ -588,7 +588,11 @@ public static int _AtExit()
         [ForbidPythonThreads]
         public static PyObject _LoadClrModule(PyObject spec)
         {
-            var mod = ImportHook.__import__(spec.GetAttr("name").ToString());
+            ModuleObject mod = null;
+            using (var modname = spec.GetAttr("name"))
+            {
+                mod = ImportHook.__import__(modname.ToString());
+            }
             // We can't return directly a ModuleObject, because the tpHandle is
             // not set, but we can return a PyObject.
             return new PyObject(mod.pyHandle);
