When shutting down don't delete any Python objects after Py_Finalize has

tonyroberts · tonyroberts · commit cc7fe9a87306 · 2015-06-16T11:40:29.000+01:00
been called.
diff --git a/src/runtime/exceptions.cs b/src/runtime/exceptions.cs
@@ -168,16 +168,19 @@ internal static void Initialize() {
         //===================================================================
 
         internal static void Shutdown() {
-            Type type = typeof(Exceptions);
-            foreach (FieldInfo fi in type.GetFields(BindingFlags.Public | 
-                                                    BindingFlags.Static)) {
-                IntPtr op = (IntPtr)fi.GetValue(type);
-                if (op != IntPtr.Zero) {
-                      Runtime.Decref(op);
+            if (0 != Runtime.Py_IsInitialized()) {
+                Type type = typeof(Exceptions);
+                foreach (FieldInfo fi in type.GetFields(BindingFlags.Public |
+                                                        BindingFlags.Static)) {
+                    IntPtr op = (IntPtr)fi.GetValue(type);
+                    if (op != IntPtr.Zero) {
+                        Runtime.Decref(op);
+                    }
                 }
+                Runtime.Decref(exceptions_module);
+                Runtime.PyObject_HasAttrString(warnings_module, "xx");
+                Runtime.Decref(warnings_module);
             }
-            Runtime.Decref(exceptions_module);
-            Runtime.Decref(warnings_module);
         }
 
         /// <summary>
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -79,14 +79,20 @@ internal static void Initialize() {
 
         internal static void Shutdown() {
 #if (PYTHON32 || PYTHON33 || PYTHON34)
-            Runtime.Decref(py_clr_module);
-            Runtime.Decref(root.pyHandle);
+            if (0 != Runtime.Py_IsInitialized()) {
+                Runtime.Decref(py_clr_module);
+                Runtime.Decref(root.pyHandle);
+            }
             ModuleDefOffset.FreeModuleDef(module_def);
 #else
-            Runtime.Decref(root.pyHandle);
-            Runtime.Decref(root.pyHandle);
+            if (0 != Runtime.Py_IsInitialized()) {
+                Runtime.Decref(root.pyHandle);
+                Runtime.Decref(root.pyHandle);
+            }
 #endif
-            Runtime.Decref(py_import);
+            if (0 != Runtime.Py_IsInitialized()) {
+                Runtime.Decref(py_import);
+            }
         }
 
         //===================================================================
