Skip to content

Drop LoadLibrary #880

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
amos402 wants to merge 14 commits into from
Closed

Drop LoadLibrary #880

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d1928dc
Drop LoadLibrary dependency
amos402 Jun 13, 2019
f000e08
Explain for getting _PyObject_NextNotImplemented
amos402 Jun 13, 2019
f882400
Update changelog and authors
amos402 Jun 13, 2019
b7715ee
Merge branch 'master' into drop-dlopen
filmor Jun 20, 2019
41ac665
Merge remote-tracking branch 'remotes/upstream/master' into drop-dlopen
amos402 Jul 1, 2019
c6dae9e
Merge branch 'master' into drop-dlopen
amos402 Jul 5, 2019
653a263
Merge branch 'master' into drop-dlopen
amos402 Dec 1, 2019
b3e889b
* Load PyModuleType without LibraryLoader
amos402 Dec 1, 2019
04d6dfb
Merge remote-tracking branch 'remotes/upstream/master' into drop-dlop…
amos402 Dec 14, 2019
5150e61
Prevent exception override
amos402 Dec 14, 2019
65e209e
Rollback symbol loading for __Internal
amos402 Dec 15, 2019
431d644
Merge branch 'master' into drop-dlopen
amos402 Feb 12, 2020
2b84394
* Fix refcnt error
amos402 Feb 12, 2020
b7797d3
Merge 'master' into drop-dlopen
amos402 Feb 13, 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
Merge remote-tracking branch 'remotes/upstream/master' into drop-dlopen
  • Loading branch information
@amos402
amos402 committed Jul 1, 2019
commit 41ac66569e8c794d7c4b6b2ef0db65cbff24f990
21 changes: 7 additions & 14 deletions src/runtime/runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

namespace Python.Runtime
{

/// <summary>
/// Encapsulates the low-level Python C API. Note that it is
/// the responsibility of the caller to have acquired the GIL
Expand Down Expand Up @@ -288,7 +289,13 @@ internal static void Initialize(bool initSigs = false)

Error = new IntPtr(-1);

// 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();

IntPtr dllLocal = IntPtr.Zero;
var loader = LibraryLoader.Get(OperatingSystem);
Copy link
Copy Markdown
Contributor

@benoithudson benoithudson Nov 21, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like you should delete these lines too, and line 295 as well since you moved it below.


// Since `_PyObject_NextNotImplemented` would set to a heap class
// for tp_iternext which doesn't implement __next__.
Expand All @@ -305,20 +312,6 @@ internal static void Initialize(bool initSigs = false)
// happen after caching the python types, above.
InitializePlatformData();

IntPtr dllLocal = IntPtr.Zero;
var loader = LibraryLoader.Get(OperatingSystem);

if (_PythonDll != "__Internal")
{
dllLocal = loader.Load(_PythonDll);
}
_PyObject_NextNotImplemented = loader.GetFunction(dllLocal, "_PyObject_NextNotImplemented");

if (dllLocal != IntPtr.Zero)
{
loader.Free(dllLocal);
}

// Initialize modules that depend on the runtime class.
AssemblyManager.Initialize();
PyCLRMetaType = MetaType.Initialize();
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.