May 29, 2021 · May 21, 2021 · May 22, 2021 · May 22, 2021
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs

            // 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.
            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
            // 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
                {
                    Py_Finalize();
                }
                else
                {
                    PyGILState_Release(state);
                }
            }
        }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -192,6 +192,7 @@ 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.
Expand DownExpand Up		@@ -249,6 +250,11 @@ 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
Expand DownExpand Up		@@ -319,6 +325,7 @@ 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();
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -393,6 +393,10 @@ internal static void Shutdown(ShutdownMode mode)
		{
		Py_Finalize();
		}
		else
		{
		PyGILState_Release(state);
Copy link Member filmorMay 22, 2021 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. This change seems unrelated, why did you add this? Copy link MemberAuthor lostmsuMay 22, 2021 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Without this`Py_Finalize` called when Python finally shuts down hangs because it can't acquire GIL.
		}
		}
		}

Expand Down