FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix so that Runtime.PyModuleType is retrieved via Python.dll (#904) by ftreurni · Pull Request #929 · pythonnet/pythonnet · GitHub

  1. pythonnet
  2. pythonnet

Repository navigation

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filmor merged 2 commits into from
Aug 2, 2019
Conversation 2 Commits 2 Checks 0 Files changed
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2c196a
Fix so that Runtime.PyModuleType is retrieved via Python.dll (#904)
Aug 1, 2019
e5826ce
Merge branch 'master' into fix-issue-904
filmor Aug 2, 2019
File filter

Filter by extension

Filter by extension .cs  (1) .md  (2) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
1 change: 1 addition & 0 deletions AUTHORS.md
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
5 changes: 4 additions & 1 deletion CHANGELOG.md
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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])
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/runtime.cs
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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)
{
Expand Down
Back | FazBrowse Home | New Git URL