Fix so that Runtime.PyModuleType is retrieved via Python.dll (#904) (… · sdpython/pythonnet@f20bcf6 · GitHub

This repository was archived by the owner on Jul 22, 2023. It is now read-only.

1. sdpython
2. pythonnet

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit f20bcf6

Browse filesBrowse the repository at this point in the historyBrowse files

ftreurni

authored and

filmor

committed

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

1 parent 1ce630e commit f20bcf6
Copy full SHA for f20bcf6

3 files changed

+6-2Lines changed: 6 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• AUTHORS.md
• CHANGELOG.md
• src/runtime
  • runtime.cs

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎AUTHORS.md‎

Copy file name to clipboardExpand all lines: AUTHORS.md

+1Lines changed: 1 addition & 0 deletions

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -27,6 +27,7 @@
27	27	- David Lassonde ([@lassond](https://github.com/lassond))
28	28	- David Lechner ([@dlech](https://github.com/dlech))
29	29	- Dmitriy Se ([@dmitriyse](https://github.com/dmitriyse))
	30	+ - Florian Treurniet ([@ftreurni](https://github.com/ftreurni))
30	31	- He-chien Tsai ([@t3476](https://github.com/t3476))
31	32	- Inna Wiesel ([@inna-w](https://github.com/inna-w))
32	33	- Ivan Cronyn ([@cronan](https://github.com/cronan))

Collapse file

‎CHANGELOG.md‎

Copy file name to clipboardExpand all lines: CHANGELOG.md

+4-1Lines changed: 4 additions & 1 deletion

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -19,6 +19,9 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
19	19
20	20	### Fixed
21	21
	22	+ - Fixed runtime that fails loading when using pythonnet in an environment
	23	+ together with Nuitka
	24	+
22	25	## [2.4.0][]
23	26
24	27	### Added
@@ -61,7 +64,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
61	64	- Fixed conversion of 'float' and 'double' values ([#486][i486])
62	65	- Fixed 'clrmethod' for python 2 ([#492][i492])
63	66	- Fixed double calling of constructor when deriving from .NET class ([#495][i495])
64		- - Fixed `clr.GetClrType` when iterating over `System` members ([#607][p607])
	67	+ - Fixed `clr.GetClrType` when iterating over `System` members ([#607][p607])
65	68	- Fixed `LockRecursionException` when loading assemblies ([#627][i627])
66	69	- Fixed errors breaking .NET Remoting on method invoke ([#276][i276])
67	70	- Fixed PyObject.GetHashCode ([#676][i676])

Collapse file

‎src/runtime/runtime.cs‎

Copy file name to clipboardExpand all lines: src/runtime/runtime.cs

+1-1Lines changed: 1 addition & 1 deletion

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	{

0 commit comments

Comments

0 (0)