pythonnet · amos402 · Jun 13, 2019 · Jun 13, 2019 · Jun 13, 2019 · Jun 20, 2019
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -59,6 +59,7 @@
 -   William Sardar ([@williamsardar])(https://github.com/williamsardar)
 -   Xavier Dupré ([@sdpython](https://github.com/sdpython))
 -   Zane Purvis ([@zanedp](https://github.com/zanedp))
+-   ([@amos402]https://github.com/amos402)
 -   ([@bltribble](https://github.com/bltribble))
 -   ([@civilx64](https://github.com/civilx64))
 -   ([@GSPP](https://github.com/GSPP))

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -57,6 +57,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   PythonEngine.Intialize will now call `Py_InitializeEx` with a default value of 0, so signals will not be configured by default on embedding. This is different from the previous behaviour, where `Py_Initialize` was called instead, which sets initSigs to 1. ([#449][i449])
 -   Refactored MethodBinder.Bind in preparation to make it extensible (#829)
 -   Look for installed Windows 10 sdk's during installation instead of relying on specific versions.
+-   Remove `LoadLibrary` call. ([#880][p880])
 
 ### Fixed
 

diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -292,26 +292,18 @@ internal static void Initialize(bool initSigs = false)
 
             Error = new IntPtr(-1);
 
+            _PyObject_NextNotImplemented = Get_PyObject_NextNotImplemented();
+            {
+                IntPtr sys = PyImport_ImportModule("sys");
+                PyModuleType = PyObject_Type(sys);
+                XDecref(sys);
+            }
+
             // Initialize data about the platform we're running on. We need
             // this for the type manager and potentially other details. Must
             // happen after caching the python types, above.
             InitializePlatformData();
 
-            IntPtr dllLocal = IntPtr.Zero;
-            var loader = LibraryLoader.Get(OperatingSystem);
-
-            if (_PythonDll != "__Internal")
-            {
-                dllLocal = loader.Load(_PythonDll);
-            }
-            _PyObject_NextNotImplemented = loader.GetFunction(dllLocal, "_PyObject_NextNotImplemented");
-            PyModuleType = loader.GetFunction(dllLocal, "PyModule_Type");
-
-            if (dllLocal != IntPtr.Zero)
-            {
-                loader.Free(dllLocal);
-            }
-
             // Initialize modules that depend on the runtime class.
             AssemblyManager.Initialize();
             PyCLRMetaType = MetaType.Initialize();
@@ -328,6 +320,29 @@ internal static void Initialize(bool initSigs = false)
             AssemblyManager.UpdatePath();
         }
 
+        private static IntPtr Get_PyObject_NextNotImplemented()
+        {
+            IntPtr globals = PyDict_New();
+            if (PyDict_SetItemString(globals, "__builtins__", PyEval_GetBuiltins()) != 0)
+            {
+                XDecref(globals);
+                throw new PythonException();
+            }
+            const string code = "class A(object): pass";
+            IntPtr res = PyRun_String(code, (IntPtr)RunFlagType.File, globals, globals);
+            if (res == IntPtr.Zero)
+            {
+                XDecref(globals);
+                throw new PythonException();
+            }
+            XDecref(res);
+            IntPtr A = PyDict_GetItemString(globals, "A");
+            IntPtr iternext = Marshal.ReadIntPtr(A, TypeOffset.tp_iternext);
+            XDecref(globals);
+            XDecref(A);
+            return iternext;
+        }
+
         /// <summary>
         /// Initializes the data about platforms.
         ///
@@ -1893,25 +1908,24 @@ internal static IntPtr PyMem_Realloc(IntPtr ptr, long size)
 
         internal static void SetNoSiteFlag()
         {
+            if (_PythonDll == "__Internal")
+            {
+                throw new NotSupportedException("SetNoSiteFlag didn't support on static compile");
+            }
             var loader = LibraryLoader.Get(OperatingSystem);
-
-            IntPtr dllLocal;
-            if (_PythonDll != "__Internal")
+            IntPtr dllLocal = loader.Load(_PythonDll);
+            if (dllLocal == IntPtr.Zero)
             {
-                dllLocal = loader.Load(_PythonDll);
+                throw new Exception($"Cannot load {_PythonDll}");
             }
-
             try
             {
                 Py_NoSiteFlag = loader.GetFunction(dllLocal, "Py_NoSiteFlag");
                 Marshal.WriteInt32(Py_NoSiteFlag, 1);
             }
             finally
             {
-                if (dllLocal != IntPtr.Zero)
-                {
-                    loader.Free(dllLocal);
-                }
+                loader.Free(dllLocal);
             }
         }
     }