@@ -56,8 +56,8 @@ public static void DomainReloadAndGC()
             Assembly pythonRunner1 = BuildAssembly("test1");
             RunAssemblyAndUnload(pythonRunner1, "test1");
 
-            // Verify that python is not initialized even though we ran it.
-            //Assert.That(Runtime.Runtime.Py_IsInitialized(), Is.Zero);
+            Assert.That(Runtime.Runtime.Py_IsInitialized() != 0,
+                "On soft-shutdown mode, Python runtime should still running");
 
             // This caused a crash because objects allocated in pythonRunner1
             // still existed in memory, but the code to do python GC on those
@@ -83,7 +83,7 @@ public static void RunPython() {
                     AppDomain.CurrentDomain.DomainUnload += OnDomainUnload;
                     string name = AppDomain.CurrentDomain.FriendlyName;
                     Console.WriteLine(string.Format(""[{0} in .NET] In PythonRunner.RunPython"", name));
-                    //PythonEngine.Initialize(softShutdown: true);
+                    PythonEngine.Initialize(softShutdown: true);
                     using (Py.GIL()) {
                         try {
                             var pyScript = string.Format(""import clr\n""
@@ -99,6 +99,7 @@ public static void RunPython() {
                             Console.WriteLine(string.Format(""[{0} in .NET] Caught exception: {1}"", name, e));
                         }
                     }
+                    PythonEngine.BeginAllowThreads();
                 }
                 static void OnDomainUnload(object sender, EventArgs e) {
                     System.Console.WriteLine(string.Format(""[{0} in .NET] unloading"", AppDomain.CurrentDomain.FriendlyName));
 
@@ -132,21 +132,21 @@ internal static void Initialize()
         /// </summary>
         internal static void Shutdown()
         {
-            if (Runtime.Py_IsInitialized() != 0)
+            if (Runtime.Py_IsInitialized() == 0)
             {
-                Type type = typeof(Exceptions);
-                foreach (FieldInfo fi in type.GetFields(BindingFlags.Public | BindingFlags.Static))
+                return;
+            }
+            Type type = typeof(Exceptions);
+            foreach (FieldInfo fi in type.GetFields(BindingFlags.Public | BindingFlags.Static))
+            {
+                var op = (IntPtr)fi.GetValue(type);
+                if (op != IntPtr.Zero)
                 {
-                    var op = (IntPtr)fi.GetValue(type);
-                    if (op != IntPtr.Zero)
-                    {
-                        Runtime.XDecref(op);
-                    }
+                    Runtime.XDecref(op);
                 }
-                Runtime.XDecref(exceptions_module);
-                Runtime.PyObject_HasAttrString(warnings_module, "xx");
-                Runtime.XDecref(warnings_module);
             }
+            Runtime.Py_CLEAR(ref exceptions_module);
+            Runtime.Py_CLEAR(ref warnings_module);
         }
 
         /// <summary>
 
@@ -324,18 +324,19 @@ public static void InitExt()
         /// </remarks>
         public static void Shutdown()
         {
-            if (initialized)
+            if (!initialized)
             {
-                PyScopeManager.Global.Clear();
-                
-                // If the shutdown handlers trigger a domain unload,
-                // don't call shutdown again.
-                AppDomain.CurrentDomain.DomainUnload -= OnDomainUnload;
+                return;
+            }
+            // If the shutdown handlers trigger a domain unload,
+            // don't call shutdown again.
+            AppDomain.CurrentDomain.DomainUnload -= OnDomainUnload;
 
-                ExecuteShutdownHandlers();
+            PyScopeManager.Global.Clear();
+            ExecuteShutdownHandlers();
 
-                initialized = false;
-            }
+            initialized = false;
+            
         }
 
         /// <summary>
 
@@ -394,6 +394,8 @@ internal static void Shutdown(bool soft)
             {
                 return;
             }
+            PyGILState_Ensure();
+
             AssemblyManager.Shutdown();
             Exceptions.Shutdown();
             ImportHook.Shutdown();
Original file line number	Diff line number	Diff line change
@@ -132,21 +132,21 @@ internal static void Initialize()
132	132	/// </summary>
133	133	internal static void Shutdown()
134	134	{
135		- if (Runtime.Py_IsInitialized() != 0)
	135	+ if (Runtime.Py_IsInitialized() == 0)
136	136	{
137		- Type type = typeof(Exceptions);
138		- foreach (FieldInfo fi in type.GetFields(BindingFlags.Public \| BindingFlags.Static))
	137	+ return;
	138	+ }
	139	+ Type type = typeof(Exceptions);
	140	+ foreach (FieldInfo fi in type.GetFields(BindingFlags.Public \| BindingFlags.Static))
	141	+ {
	142	+ var op = (IntPtr)fi.GetValue(type);
	143	+ if (op != IntPtr.Zero)
139	144	{
140		- var op = (IntPtr)fi.GetValue(type);
141		- if (op != IntPtr.Zero)
142		- {
143		- Runtime.XDecref(op);
144		- }
	145	+ Runtime.XDecref(op);
145	146	}
146		- Runtime.XDecref(exceptions_module);
147		- Runtime.PyObject_HasAttrString(warnings_module, "xx");
148		- Runtime.XDecref(warnings_module);
149	147	}
	148	+ Runtime.Py_CLEAR(ref exceptions_module);
	149	+ Runtime.Py_CLEAR(ref warnings_module);
150	150	}
151	151
152	152	/// <summary>
Original file line number	Diff line number	Diff line change
@@ -394,6 +394,8 @@ internal static void Shutdown(bool soft)
394	394	{
395	395	return;
396	396	}
	397	+ PyGILState_Ensure();
	398	+
397	399	AssemblyManager.Shutdown();
398	400	Exceptions.Shutdown();
399	401	ImportHook.Shutdown();