pythonnet · amos402 · Jun 13, 2019 · Jun 13, 2019 · Jun 13, 2019 · Jun 20, 2019
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -53,6 +53,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
@@ -45,6 +45,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
 
@@ -60,7 +61,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   Fixed conversion of 'float' and 'double' values ([#486][i486])
 -   Fixed 'clrmethod' for python 2 ([#492][i492])
 -   Fixed double calling of constructor when deriving from .NET class ([#495][i495])
--   Fixed `clr.GetClrType` when iterating over `System` members ([#607][p607]) 
+-   Fixed `clr.GetClrType` when iterating over `System` members ([#607][p607])
 -   Fixed `LockRecursionException` when loading assemblies ([#627][i627])
 -   Fixed errors breaking .NET Remoting on method invoke ([#276][i276])
 -   Fixed PyObject.GetHashCode ([#676][i676])

diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -297,16 +297,20 @@ internal static void Initialize(bool initSigs = false)
             IntPtr dllLocal = IntPtr.Zero;
             var loader = LibraryLoader.Get(OperatingSystem);
 
-            if (_PythonDll != "__Internal")
-            {
-                dllLocal = loader.Load(_PythonDll);
-            }
-            _PyObject_NextNotImplemented = loader.GetFunction(dllLocal, "_PyObject_NextNotImplemented");
+            // Since `_PyObject_NextNotImplemented` would set to a heap class
+            // for tp_iternext which doesn't implement __next__.
+            // Thus we need a heap class to get it, the ZipImportError is a
+            // heap class and it's in builtins, so we can use it as a trick.
+            var zipimport = PyImport_ImportModule("zipimport");
+            var ZipImportError = PyObject_GetAttrString(zipimport, "ZipImportError");
+            _PyObject_NextNotImplemented = Marshal.ReadIntPtr(ZipImportError, TypeOffset.tp_iternext);
+            XDecref(ZipImportError);
+            XDecref(zipimport);
 
-            if (dllLocal != IntPtr.Zero)
-            {
-                loader.Free(dllLocal);
-            }
+            // 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();
 
             // Initialize modules that depend on the runtime class.
             AssemblyManager.Initialize();