Fix a few bugs

- Swapped UCS2 in one place - Explicitly acquire GILState in InternalInitialize - Fix a few problems with short-ints by using larger numbers (`PyLongType`) or dropping the respective return (`AtExit`)
pythonnet · filmor · Nov 9, 2019 · Apr 10, 2020 · Apr 11, 2020 · Apr 11, 2020
commit 054b87263827c47b5e2f7cefad932586392fd351
diff --git a/Python.Runtime/Python.Runtime.csproj b/Python.Runtime/Python.Runtime.csproj
@@ -5,6 +5,12 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="resources\clr.py">
+      <LogicalName>clr.py</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="System.Reflection.Emit" Version="4.6.0" />
   </ItemGroup>

diff --git a/Python.Runtime/moduleobject.cs b/Python.Runtime/moduleobject.cs
@@ -284,7 +284,7 @@ public static IntPtr tp_getattro(IntPtr ob, IntPtr key)
                 Exceptions.SetError(e);
                 return IntPtr.Zero;
             }
-            
+
 
             if (attr == null)
             {
@@ -435,7 +435,7 @@ public static Assembly AddReference(string name)
         /// clr.GetClrType(IComparable) gives you the Type for IComparable,
         /// that you can e.g. perform reflection on. Similar to typeof(IComparable) in C#
         /// or clr.GetClrType(IComparable) in IronPython.
-        /// 
+        ///
         /// </summary>
         /// <param name="type"></param>
         /// <returns>The Type object</returns>
@@ -475,9 +475,9 @@ public static string[] ListAssemblies(bool verbose)
         }
 
         [ModuleFunction]
-        public static int _AtExit()
+        public static void _AtExit()
         {
-            return Runtime.AtExit();
+            Runtime.AtExit();
         }
     }
 }
diff --git a/Python.Runtime/pythonengine.cs b/Python.Runtime/pythonengine.cs
@@ -256,8 +256,10 @@ static void OnDomainUnload(object _, EventArgs __)
         /// </summary>
         public static int InternalInitialize(IntPtr data, int size)
         {
+            IntPtr gilState = IntPtr.Zero;
             try
             {
+                gilState = Runtime.PyGILState_Ensure();
                 Initialize(setSysArgv: false);
 
                 // Trickery - when the import hook is installed into an already
@@ -292,16 +294,22 @@ public static int InternalInitialize(IntPtr data, int size)
                 PythonEngine.Exec(code);
                 return 0;
             }
-            catch (PythonException e)
+            catch (PythonException exc)
             {
-                e.Restore();
+                exc.Restore();
+                Console.WriteLine($"{exc.Message}\n{exc.Format()}");
                 return -1;
             }
             catch (Exception exc)
             {
                 Console.WriteLine($"{exc}\n{exc.StackTrace}");
                 return -1;
             }
+            finally
+            {
+                if (gilState != IntPtr.Zero)
+                    Runtime.PyGILState_Release(gilState);
+            }
         }
 
         /// <summary>

diff --git a/Python.Runtime/runtime.cs b/Python.Runtime/runtime.cs
@@ -1,3 +1,4 @@
+using System.Runtime.CompilerServices;
 using System;
 using System.Runtime.InteropServices;
 using System.Security;
@@ -22,7 +23,7 @@ public class Runtime
 
         public static int UCS => _UCS;
 
-#if UCS2
+#if !UCS2
         internal const int _UCS = 4;
 
         /// <summary>
@@ -215,16 +216,22 @@ internal static void Initialize(bool initSigs = false)
                 () => PyDictType = IntPtr.Zero);
             XDecref(op);
 
-            op = PyInt_FromInt32(0);
-            SetPyMember(ref PyIntType, PyObject_Type(op),
-                () => PyIntType = IntPtr.Zero);
-            XDecref(op);
+            // Choose a number >1000 st. we get a real PyObject
+            op = PyLong_FromLong(1000);
 
-            op = PyLong_FromLong(0);
             SetPyMember(ref PyLongType, PyObject_Type(op),
                 () => PyLongType = IntPtr.Zero);
             XDecref(op);
 
+#if !PYTHON2
+            PyIntType = PyLongType;
+#else
+            op = PyInt_FromInt32(1000);
+            SetPyMember(ref PyIntType, PyObject_Type(op),
+                () => PyIntType = IntPtr.Zero);
+            XDecref(op);
+#endif
+
             op = PyFloat_FromDouble(0);
             SetPyMember(ref PyFloatType, PyObject_Type(op),
                 () => PyFloatType = IntPtr.Zero);
@@ -351,16 +358,15 @@ internal static void Shutdown()
         }
 
         // called *without* the GIL acquired by clr._AtExit
-        internal static int AtExit()
+        internal static void AtExit()
         {
             lock (IsFinalizingLock)
             {
                 IsFinalizing = true;
             }
-            return 0;
         }
 
-        private static void SetPyMember(ref IntPtr obj, IntPtr value, Action onRelease)
+        private static void SetPyMember(ref IntPtr obj, IntPtr value, Action onRelease, [CallerLineNumber]int lineNumber = 0)
         {
             // XXX: For current usages, value should not be null.
             PythonException.ThrowIfIsNull(value);
@@ -1444,6 +1450,7 @@ internal static string GetManagedString(IntPtr op)
                 int size = length * _UCS;
                 var buffer = new byte[size];
                 Marshal.Copy(p, buffer, 0, size);
+
                 return PyEncoding.GetString(buffer, 0, size);
             }
 
@@ -1877,8 +1884,13 @@ internal static void SetNoSiteFlag()
         /// </summary>
         internal static IntPtr GetBuiltins()
         {
-            return IsPython3 ? PyImport_ImportModule("builtins")
-                    : PyImport_ImportModule("__builtin__");
+#if !PYTHON2
+            const string modName = "builtins";
+#else
+            const string modName = "__builtin__";
+#endif
+            Console.WriteLine($"Loading {modName}");
+            return PyImport_ImportModule(modName);
         }
     }