Add ShutdownMode.Default refer to normal mode if no EnvironmentVariable control exists

amos402 · amos402 · commit 9874cd123393 · 2020-02-10T03:07:45.000+08:00
diff --git a/src/embed_tests/DomainCode.cs b/src/embed_tests/DomainCode.cs
@@ -114,15 +114,23 @@ from Python.EmbeddingTest.Domain import MyClass
 
     public static void RunTestObject(IntPtr handle)
     {
-        using (Py.GIL())
+        try
         {
-            
-            using (PyObject obj = new PyObject(handle))
+            using (Py.GIL())
             {
-                obj.InvokeMethod("Method");
-                obj.InvokeMethod("StaticMethod");
+            
+                using (PyObject obj = new PyObject(handle))
+                {
+                    obj.InvokeMethod("Method");
+                    obj.InvokeMethod("StaticMethod");
+                }
             }
         }
+        catch (Exception e)
+        {
+            Debug.WriteLine(e);
+            throw;
+        }
     }
 
     public static void ReleaseTestObject(IntPtr handle)
diff --git a/src/embed_tests/TestRuntime.cs b/src/embed_tests/TestRuntime.cs
@@ -39,6 +39,10 @@ public static void PlatformCache()
         [Test]
         public static void Py_IsInitializedValue()
         {
+            if (Runtime.Runtime.Py_IsInitialized() == 1)
+            {
+                Runtime.Runtime.PyGILState_Ensure();
+            }
             Runtime.Runtime.Py_Finalize();
             Assert.AreEqual(0, Runtime.Runtime.Py_IsInitialized());
             Runtime.Runtime.Py_Initialize();
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -172,7 +172,7 @@ public static void Initialize(bool setSysArgv = true, bool initSigs = false, Shu
         /// interpreter lock (GIL) to call this method.
         /// initSigs can be set to 1 to do default python signal configuration. This will override the way signals are handled by the application.
         /// </remarks>
-        public static void Initialize(IEnumerable<string> args, bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Normal)
+        public static void Initialize(IEnumerable<string> args, bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Default)
         {
             if (initialized)
             {
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -132,25 +132,31 @@ public class Runtime
         /// <summary>
         /// Initialize the runtime...
         /// </summary>
-        internal static void Initialize(bool initSigs = false, ShutdownMode mode = ShutdownMode.Normal)
+        internal static void Initialize(bool initSigs = false, ShutdownMode mode = ShutdownMode.Default)
         {
             if (_isInitialized)
             {
                 return;
             }
             _isInitialized = true;
 
-            if (Environment.GetEnvironmentVariable("PYTHONNET_SOFT_SHUTDOWN") == "1")
+            if (mode == ShutdownMode.Default)
             {
-                mode = ShutdownMode.Soft;
-            }
-#if !NETSTANDARD
-            else if (Environment.GetEnvironmentVariable("PYTHONNET_RELOAD_SHUTDOWN") == "1")
-            {
-                mode = ShutdownMode.Reload;
-            }
+                if (Environment.GetEnvironmentVariable("PYTHONNET_SOFT_SHUTDOWN") == "1")
+                {
+                    mode = ShutdownMode.Soft;
+                }
+    #if !NETSTANDARD
+                else if (Environment.GetEnvironmentVariable("PYTHONNET_RELOAD_SHUTDOWN") == "1")
+                {
+                    mode = ShutdownMode.Reload;
+                }
 #endif
-            //mode = ShutdownMode.Reload;
+                else
+                {
+                    mode = ShutdownMode.Normal;
+                }
+            }
 
             ShutdownMode = mode;
             if (Py_IsInitialized() == 0)
@@ -2196,6 +2202,7 @@ internal static IntPtr GetBuiltins()
 
     public enum ShutdownMode
     {
+        Default,
         Normal,
         Soft,
 #if !NETSTANDARD

Original file line number	Diff line number	Diff line change
`@@ -114,15 +114,23 @@ from Python.EmbeddingTest.Domain import MyClass`
`114`	`114`
`115`	`115`	`public static void RunTestObject(IntPtr handle)`
`116`	`116`	`{`
`117`		`- using (Py.GIL())`
	`117`	`+ try`
`118`	`118`	`{`
`119`		`-`
`120`		`- using (PyObject obj = new PyObject(handle))`
	`119`	`+ using (Py.GIL())`
`121`	`120`	`{`
`122`		`- obj.InvokeMethod("Method");`
`123`		`- obj.InvokeMethod("StaticMethod");`
	`121`	`+`
	`122`	`+ using (PyObject obj = new PyObject(handle))`
	`123`	`+ {`
	`124`	`+ obj.InvokeMethod("Method");`
	`125`	`+ obj.InvokeMethod("StaticMethod");`
	`126`	`+ }`
`124`	`127`	`}`
`125`	`128`	`}`
	`129`	`+ catch (Exception e)`
	`130`	`+ {`
	`131`	`+ Debug.WriteLine(e);`
	`132`	`+ throw;`
	`133`	`+ }`
`126`	`134`	`}`
`127`	`135`
`128`	`136`	`public static void ReleaseTestObject(IntPtr handle)`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ public static void Initialize(bool setSysArgv = true, bool initSigs = false, Shu`
`172`	`172`	`/// interpreter lock (GIL) to call this method.`
`173`	`173`	`/// initSigs can be set to 1 to do default python signal configuration. This will override the way signals are handled by the application.`
`174`	`174`	`/// </remarks>`
`175`		`- public static void Initialize(IEnumerable<string> args, bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Normal)`
	`175`	`+ public static void Initialize(IEnumerable<string> args, bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Default)`
`176`	`176`	`{`
`177`	`177`	`if (initialized)`
`178`	`178`	`{`