Commitf812ec7

committed

Revert "handle ProcessExit event to avoid Python crash when CLR (in particular Mono) is unloaded before Python stops"

This reverts commit39af4cb.

1 parent651d145 commitf812ec7Copy full SHA for f812ec7

File tree

-11

lines changed

-11

lines changed

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,6 @@ public static void Initialize(IEnumerable<string> args, bool setSysArgv = true,`
`192`	`192`
`193`	`193`	`// Make sure we clean up properly on app domain unload.`
`194`	`194`	`AppDomain.CurrentDomain.DomainUnload+=OnDomainUnload;`
`195`		`-AppDomain.CurrentDomain.ProcessExit+=OnProcessExit;`
`196`	`195`
`197`	`196`	`// The global scope gets used implicitly quite early on, remember`
`198`	`197`	`// to clear it out when we shut down.`
`@@ -250,11 +249,6 @@ static void OnDomainUnload(object _, EventArgs __)`
`250`	`249`	`Shutdown();`
`251`	`250`	`}`
`252`	`251`
`253`		`-staticvoidOnProcessExit(object_,EventArgs__)`
`254`		`-{`
`255`		`-Shutdown();`
`256`		`-}`
`257`		`-`
`258`	`252`	`/// <summary>`
`259`	`253`	`/// A helper to perform initialization from the context of an active`
`260`	`254`	`/// CPython interpreter process - this bootstraps the managed runtime`
`@@ -325,7 +319,6 @@ public static void Shutdown(ShutdownMode mode)`
`325`	`319`	`// If the shutdown handlers trigger a domain unload,`
`326`	`320`	`// don't call shutdown again.`
`327`	`321`	`AppDomain.CurrentDomain.DomainUnload-=OnDomainUnload;`
`328`		`-AppDomain.CurrentDomain.ProcessExit-=OnProcessExit;`
`329`	`322`
`330`	`323`	`PyScopeManager.Global.Clear();`
`331`	`324`	`ExecuteShutdownHandlers();`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -393,10 +393,6 @@ internal static void Shutdown(ShutdownMode mode)`
`393`	`393`	`{`
`394`	`394`	`Py_Finalize();`
`395`	`395`	`}`
`396`		`-else`
`397`		`-{`
`398`		`-PyGILState_Release(state);`
`399`		`-}`
`400`	`396`	`}`
`401`	`397`	`}`
`402`	`398`

Comments

(0)