Commit58bd58c

committed

Ensure that shutdown is called from Python

1 parente9cbb87 commit58bd58cCopy full SHA for 58bd58c

File tree

-4

lines changed

-4

lines changed

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ def set_runtime(runtime):`
`16`	`16`
`17`	`17`
`18`	`18`	`defset_default_runtime()->None:`
`19`		`-ifsys.platform=='win32':`
	`19`	`+ifsys.platform=="win32":`
`20`	`20`	`set_runtime(clr_loader.get_netfx())`
`21`	`21`	`else:`
`22`	`22`	`set_runtime(clr_loader.get_mono())`
`@@ -36,22 +36,23 @@ def load():`
`36`	`36`	`set_default_runtime()`
`37`	`37`
`38`	`38`	`dll_path=join(dirname(__file__),"runtime","Python.Runtime.dll")`
`39`		`-`
	`39`	`+`
`40`	`40`	`_LOADER_ASSEMBLY=_RUNTIME.get_assembly(dll_path)`
`41`	`41`
`42`	`42`	`func=_LOADER_ASSEMBLY["Python.Runtime.Loader.Initialize"]`
`43`		`-iffunc(''.encode("utf8"))!=0:`
	`43`	`+iffunc(b"")!=0:`
`44`	`44`	`raiseRuntimeError("Failed to initialize Python.Runtime.dll")`
`45`	`45`
`46`	`46`	`importatexit`
	`47`	`+`
`47`	`48`	`atexit.register(unload)`
`48`	`49`
`49`	`50`
`50`	`51`	`defunload():`
`51`	`52`	`global_RUNTIME`
`52`	`53`	`if_LOADER_ASSEMBLYisnotNone:`
`53`	`54`	`func=_LOADER_ASSEMBLY["Python.Runtime.Loader.Shutdown"]`
`54`		`-iffunc(b"")!=0:`
	`55`	`+iffunc(b"full_shutdown")!=0:`
`55`	`56`	`raiseRuntimeError("Failed to call Python.NET shutdown")`
`56`	`57`
`57`	`58`	`if_RUNTIMEisnotNone:`

Comments

(0)