Commit0775458

authored

Merge pull request#1440 from losttech/PR/No_find_libpyton_for_import_clr

Do not call `find_libpython` during `import clr` as Python.Runtime can find it on its own

2 parents23527d1 +dff75d2 commit0775458Copy full SHA for 0775458

File tree

-13

lines changed

-13

lines changed

Lines changed: 2 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ def load():`
`29`	`29`	`if_LOADED:`
`30`	`30`	`return`
`31`	`31`
`32`		`-from .find_libpythonimportlinked_libpython`
`33`	`32`	`fromos.pathimportjoin,dirname`
`34`	`33`
`35`	`34`	`if_RUNTIMEisNone:`
`@@ -38,21 +37,11 @@ def load():`
`38`	`37`	`set_default_runtime()`
`39`	`38`
`40`	`39`	`dll_path=join(dirname(__file__),"runtime","Python.Runtime.dll")`
`41`		`-libpython=linked_libpython()`
`42`		`-`
`43`		`-iflibpythonand_FFIisNoneandsys.platform!="win32":`
`44`		`-# Load and leak libpython handle s.t. the .NET runtime doesn't dlcloses`
`45`		`-# it`
`46`		`-importposix`
`47`		`-`
`48`		`-importcffi`
`49`		`-_FFI=cffi.FFI()`
`50`		`-_FFI.dlopen(libpython,posix.RTLD_NODELETE\|posix.RTLD_LOCAL)`
`51`		`-`
	`40`	`+`
`52`	`41`	`_LOADER_ASSEMBLY=_RUNTIME.get_assembly(dll_path)`
`53`	`42`
`54`	`43`	`func=_LOADER_ASSEMBLY["Python.Runtime.Loader.Initialize"]`
`55`		`-iffunc(f"{libpythonor''}".encode("utf8"))!=0:`
	`44`	`+iffunc(''.encode("utf8"))!=0:`
`56`	`45`	`raiseRuntimeError("Failed to initialize Python.Runtime.dll")`
`57`	`46`
`58`	`47`	`importatexit`

Comments

(0)