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

lostmsu · lostmsu · commit f812ec788779 · 2021-05-29T15:15:06.000-07:00
This reverts commit 39af4cb.
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -192,7 +192,6 @@ public static void Initialize(IEnumerable<string> args, bool setSysArgv = true,
 
             // Make sure we clean up properly on app domain unload.
             AppDomain.CurrentDomain.DomainUnload += OnDomainUnload;
-            AppDomain.CurrentDomain.ProcessExit += OnProcessExit;
 
             // The global scope gets used implicitly quite early on, remember
             // to clear it out when we shut down.
@@ -250,11 +249,6 @@ static void OnDomainUnload(object _, EventArgs __)
             Shutdown();
         }
 
-        static void OnProcessExit(object _, EventArgs __)
-        {
-            Shutdown();
-        }
-
         /// <summary>
         /// A helper to perform initialization from the context of an active
         /// CPython interpreter process - this bootstraps the managed runtime
@@ -325,7 +319,6 @@ public static void Shutdown(ShutdownMode mode)
             // If the shutdown handlers trigger a domain unload,
             // don't call shutdown again.
             AppDomain.CurrentDomain.DomainUnload -= OnDomainUnload;
-            AppDomain.CurrentDomain.ProcessExit -= OnProcessExit;
 
             PyScopeManager.Global.Clear();
             ExecuteShutdownHandlers();
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -393,10 +393,6 @@ internal static void Shutdown(ShutdownMode mode)
                 {
                     Py_Finalize();
                 }
-                else
-                {
-                    PyGILState_Release(state);
-                }
             }
         }
 

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`