Skip to content

First chunk of modernisation changes #1109

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

Closed
filmor wants to merge 13 commits into from
Closed

First chunk of modernisation changes #1109

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f04e948
First chunk of modernisation changes
filmor Nov 9, 2019
52e4f15
Move new files
filmor Apr 10, 2020
832c63f
Drop obsolete tools
filmor Apr 11, 2020
063d0f9
Add loader DLL that fixes the __Internal ref
filmor Apr 11, 2020
baf0535
Use deferred reading to side-step dependency loading
filmor Apr 11, 2020
054b872
Fix a few bugs
filmor Apr 11, 2020
d1babcf
Leak libpython handle
filmor Apr 12, 2020
7f84915
Remove debug write-line
filmor Apr 12, 2020
5c3109d
Add Shutdown call, disable Py_Finalize for now
filmor Apr 14, 2020
be22720
Update interop3.cs to Python 3.7 (temporary)
filmor Apr 14, 2020
503b4b8
Add unloading as atexit call
filmor Apr 14, 2020
912ef3b
Write qualname
filmor Apr 14, 2020
1adc2ff
Last state
filmor May 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Leak libpython handle
  • Loading branch information
@filmor
filmor committed Apr 12, 2020
commit d1babcf4cd16518368b08b6b5fa09c21a0435f4d
7 changes: 6 additions & 1 deletion pythonnet/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import os
import sys
import ctypes

_RUNTIME = None

Expand All @@ -20,12 +21,16 @@ def load():
dll_path = os.path.join(os.path.dirname(__file__), "dlls", "Python.Loader.dll")
runtime_dll_path = os.path.join(os.path.dirname(dll_path), "Python.Runtime.dll")

# Load and leak libpython handle s.t. the .NET runtime doesn't dlcloses it
libpython = _find_libpython()
_ = ctypes.CDLL(libpython)

assembly = _RUNTIME.get_assembly(dll_path)

print("Got assembly", assembly)
func = assembly["Python.Internal.Initialize"]

print("Got func:", func)

if func(f"{runtime_dll_path};{_find_libpython()}".encode("utf8")) != 0:
if func(f"{runtime_dll_path};{libpython}".encode("utf8")) != 0:
raise RuntimeError("Failed to initialize Python.Runtime.dll")