Fixed #449, by added initSigs as an optional parameter to PythonEngine.Initialize.

rmadsen-ks · filmor · commit 77654749301b · 2018-11-15T13:43:53.000+01:00
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -140,9 +140,9 @@ public static void Initialize()
             Initialize(setSysArgv: true);
         }
 
-        public static void Initialize(bool setSysArgv = true)
+        public static void Initialize(bool setSysArgv = true, bool initSigs = false)
         {
-            Initialize(Enumerable.Empty<string>(), setSysArgv: setSysArgv);
+            Initialize(Enumerable.Empty<string>(), setSysArgv: setSysArgv, initSigs: initSigs);
         }
 
         /// <summary>
@@ -153,8 +153,9 @@ public static void Initialize(bool setSysArgv = true)
         /// more than once, though initialization will only happen on the
         /// first call. It is *not* necessary to hold the Python global
         /// 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)
+        public static void Initialize(IEnumerable<string> args, bool setSysArgv = true, bool initSigs = false)
         {
             if (!initialized)
             {
@@ -164,7 +165,7 @@ public static void Initialize(IEnumerable<string> args, bool setSysArgv = true)
                 // during an initial "import clr", and the world ends shortly thereafter.
                 // This is probably masking some bad mojo happening somewhere in Runtime.Initialize().
                 delegateManager = new DelegateManager();
-                Runtime.Initialize();
+                Runtime.Initialize(initSigs);
                 initialized = true;
                 Exceptions.Clear();
 
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -269,11 +269,11 @@ public enum MachineType
         /// <summary>
         /// Initialize the runtime...
         /// </summary>
-        internal static void Initialize()
+        internal static void Initialize(bool initSigs)
         {
             if (Py_IsInitialized() == 0)
             {
-                Py_Initialize();
+                Py_InitializeEx(initSigs ? 1 : 0);
             }
 
             if (PyEval_ThreadsInitialized() == 0)
@@ -727,6 +727,9 @@ internal static unsafe long Refcount(IntPtr op)
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern void Py_Initialize();
 
+        [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern void Py_InitializeEx(int initsigs);
+
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern int Py_IsInitialized();
 

Original file line number	Diff line number	Diff line change
`@@ -140,9 +140,9 @@ public static void Initialize()`
`140`	`140`	`Initialize(setSysArgv: true);`
`141`	`141`	`}`
`142`	`142`
`143`		`- public static void Initialize(bool setSysArgv = true)`
	`143`	`+ public static void Initialize(bool setSysArgv = true, bool initSigs = false)`
`144`	`144`	`{`
`145`		`- Initialize(Enumerable.Empty<string>(), setSysArgv: setSysArgv);`
	`145`	`+ Initialize(Enumerable.Empty<string>(), setSysArgv: setSysArgv, initSigs: initSigs);`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`/// <summary>`
`@@ -153,8 +153,9 @@ public static void Initialize(bool setSysArgv = true)`
`153`	`153`	`/// more than once, though initialization will only happen on the`
`154`	`154`	`/// first call. It is not necessary to hold the Python global`
`155`	`155`	`/// interpreter lock (GIL) to call this method.`
	`156`	`+ /// initSigs can be set to 1 to do default python signal configuration. This will override the way signals are handled by the application.`
`156`	`157`	`/// </remarks>`
`157`		`- public static void Initialize(IEnumerable<string> args, bool setSysArgv = true)`
	`158`	`+ public static void Initialize(IEnumerable<string> args, bool setSysArgv = true, bool initSigs = false)`
`158`	`159`	`{`
`159`	`160`	`if (!initialized)`
`160`	`161`	`{`
`@@ -164,7 +165,7 @@ public static void Initialize(IEnumerable<string> args, bool setSysArgv = true)`
`164`	`165`	`// during an initial "import clr", and the world ends shortly thereafter.`
`165`	`166`	`// This is probably masking some bad mojo happening somewhere in Runtime.Initialize().`
`166`	`167`	`delegateManager = new DelegateManager();`
`167`		`- Runtime.Initialize();`
	`168`	`+ Runtime.Initialize(initSigs);`
`168`	`169`	`initialized = true;`
`169`	`170`	`Exceptions.Clear();`
`170`	`171`