Fix so that Runtime.PyModuleType is retrieved via Python.dll (pythonnet#904) (pythonnet#929)

ftreurni · filmor · commit f20bcf6498f3 · 2019-08-02T12:21:48.000+02:00
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -27,6 +27,7 @@
 -   David Lassonde ([@lassond](https://github.com/lassond))
 -   David Lechner ([@dlech](https://github.com/dlech))
 -   Dmitriy Se ([@dmitriyse](https://github.com/dmitriyse))
+-   Florian Treurniet ([@ftreurni](https://github.com/ftreurni))
 -   He-chien Tsai ([@t3476](https://github.com/t3476))
 -   Inna Wiesel ([@inna-w](https://github.com/inna-w))
 -   Ivan Cronyn ([@cronan](https://github.com/cronan))
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,9 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 
 ### Fixed
 
+- Fixed runtime that fails loading when using pythonnet in an environment
+  together with Nuitka
+
 ## [2.4.0][]
 
 ### Added
@@ -61,7 +64,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
@@ -205,7 +205,6 @@ internal static void Initialize(bool initSigs = false)
             PyNotImplemented = PyObject_GetAttrString(op, "NotImplemented");
             PyBaseObjectType = PyObject_GetAttrString(op, "object");
 
-            PyModuleType = PyObject_Type(op);
             PyNone = PyObject_GetAttrString(op, "None");
             PyTrue = PyObject_GetAttrString(op, "True");
             PyFalse = PyObject_GetAttrString(op, "False");
@@ -302,6 +301,7 @@ internal static void Initialize(bool initSigs = false)
                 dllLocal = loader.Load(_PythonDll);
             }
             _PyObject_NextNotImplemented = loader.GetFunction(dllLocal, "_PyObject_NextNotImplemented");
+            PyModuleType = loader.GetFunction(dllLocal, "PyModule_Type");
 
             if (dllLocal != IntPtr.Zero)
             {

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,6 @@ internal static void Initialize(bool initSigs = false)`
`205`	`205`	`PyNotImplemented = PyObject_GetAttrString(op, "NotImplemented");`
`206`	`206`	`PyBaseObjectType = PyObject_GetAttrString(op, "object");`
`207`	`207`
`208`		`- PyModuleType = PyObject_Type(op);`
`209`	`208`	`PyNone = PyObject_GetAttrString(op, "None");`
`210`	`209`	`PyTrue = PyObject_GetAttrString(op, "True");`
`211`	`210`	`PyFalse = PyObject_GetAttrString(op, "False");`
`@@ -302,6 +301,7 @@ internal static void Initialize(bool initSigs = false)`
`302`	`301`	`dllLocal = loader.Load(_PythonDll);`
`303`	`302`	`}`
`304`	`303`	`_PyObject_NextNotImplemented = loader.GetFunction(dllLocal, "_PyObject_NextNotImplemented");`
	`304`	`+ PyModuleType = loader.GetFunction(dllLocal, "PyModule_Type");`
`305`	`305`
`306`	`306`	`if (dllLocal != IntPtr.Zero)`
`307`	`307`	`{`