Revert "(WIP) import hook in the pytohn module"

BadSingleton · BadSingleton · commit 73958ed239b2 · 2021-06-02T10:56:48.000-04:00
This reverts commit 4684523.
diff --git a/pythonnet/util/__init__.py b/pythonnet/util/__init__.py
@@ -1 +1 @@
-from ..find_libpython import find_libpython
+from .find_libpython import find_libpython
diff --git a/pythonnet/util/import_hook.py b/pythonnet/util/import_hook.py
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -69,7 +69,7 @@ internal static unsafe void Initialize()
 
             // Add/create the MetaPathLoader
             SetupNamespaceTracking();
-            PythonEngine.Exec("import pythonnet.util.import_hook;pythonnet.util.import_hook.init_import_hook()");
+            PythonEngine.Exec(LoaderCode);
         }
 
 
@@ -225,7 +225,7 @@ public static unsafe NewReference GetCLRModule()
         /// <summary>
         /// The hook to import a CLR module into Python
         /// </summary>
-        public static ModuleObject Import(string modname)
+        public static ModuleObject __import__(string modname)
         {
             // Traverse the qualified module name to get the named module. 
             // Note that if
diff --git a/src/runtime/moduleobject.cs b/src/runtime/moduleobject.cs
@@ -598,7 +598,7 @@ public static PyObject _LoadClrModule(PyObject spec)
             ModuleObject mod = null;
             using (var modname = spec.GetAttr("name"))
             {
-                mod = ImportHook.Import(modname.ToString());
+                mod = ImportHook.__import__(modname.ToString());
             }
             // We can't return directly a ModuleObject, because the tpHandle is
             // not set, but we can return a PyObject.
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -153,16 +153,6 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd
             ClassDerivedObject.Reset();
             TypeManager.Initialize();
 
-            // Need to add the runtime directory to sys.path so that we
-            // can find built-in assemblies like System.Data, et. al.
-            string rtdir = RuntimeEnvironment.GetRuntimeDirectory();
-            IntPtr path = PySys_GetObject("path").DangerousGetAddress();
-            IntPtr item = PyString_FromString(rtdir);
-            if (PySequence_Contains(path, item) == 0)
-            {
-                PyList_Append(new BorrowedReference(path), item);
-            }
-            XDecref(item);
             // Initialize modules that depend on the runtime class.
             AssemblyManager.Initialize();
             OperatorMethod.Initialize();
@@ -177,6 +167,16 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd
             }
             Exceptions.Initialize();
 
+            // Need to add the runtime directory to sys.path so that we
+            // can find built-in assemblies like System.Data, et. al.
+            string rtdir = RuntimeEnvironment.GetRuntimeDirectory();
+            IntPtr path = PySys_GetObject("path").DangerousGetAddress();
+            IntPtr item = PyString_FromString(rtdir);
+            if (PySequence_Contains(path, item) == 0)
+            {
+                PyList_Append(new BorrowedReference(path), item);
+            }
+            XDecref(item);
             AssemblyManager.UpdatePath();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-from ..find_libpython import find_libpython`
	`1`	`+from .find_libpython import find_libpython`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ internal static unsafe void Initialize()`
`69`	`69`
`70`	`70`	`// Add/create the MetaPathLoader`
`71`	`71`	`SetupNamespaceTracking();`
`72`		`- PythonEngine.Exec("import pythonnet.util.import_hook;pythonnet.util.import_hook.init_import_hook()");`
	`72`	`+ PythonEngine.Exec(LoaderCode);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`
`@@ -225,7 +225,7 @@ public static unsafe NewReference GetCLRModule()`
`225`	`225`	`/// <summary>`
`226`	`226`	`/// The hook to import a CLR module into Python`
`227`	`227`	`/// </summary>`
`228`		`- public static ModuleObject Import(string modname)`
	`228`	`+ public static ModuleObject __import__(string modname)`
`229`	`229`	`{`
`230`	`230`	`// Traverse the qualified module name to get the named module.`
`231`	`231`	`// Note that if`
Original file line number	Diff line number	Diff line change
`@@ -598,7 +598,7 @@ public static PyObject _LoadClrModule(PyObject spec)`
`598`	`598`	`ModuleObject mod = null;`
`599`	`599`	`using (var modname = spec.GetAttr("name"))`
`600`	`600`	`{`
`601`		`- mod = ImportHook.Import(modname.ToString());`
	`601`	`+ mod = ImportHook.__import__(modname.ToString());`
`602`	`602`	`}`
`603`	`603`	`// We can't return directly a ModuleObject, because the tpHandle is`
`604`	`604`	`// not set, but we can return a PyObject.`