Fix PythonEngine.Version

vmuriart · vmuriart · commit 6f3f3571229b · 2017-03-02T09:57:31.000-07:00
Add TestPythonEngineProperties. Ensure PythonEngine properties are working correctly. Currently only work on 32bit machines. Closes #413
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,6 +51,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   Fixed `AppDomain` unload during GC (#397)(#400)
 -   Fixed `Py_Main` & `PySys_SetArgvEx` `no mem error` on `UCS4/PY3` (#399)
 -   Fixed `Python.Runtime.dll.config` on macOS (#120)
+-   Fixed crash on `PythonEngine.Version` (#413)
 
 ### Removed
 
diff --git a/src/embed_tests/Python.EmbeddingTest.csproj b/src/embed_tests/Python.EmbeddingTest.csproj
@@ -89,6 +89,7 @@
     <Compile Include="pyrunstring.cs" />
     <Compile Include="pythonexception.cs" />
     <Compile Include="pytuple.cs" />
+    <Compile Include="TestPythonEngineProperties.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\runtime\Python.Runtime.csproj">
diff --git a/src/embed_tests/TestPythonEngineProperties.cs b/src/embed_tests/TestPythonEngineProperties.cs
@@ -0,0 +1,70 @@
+using System;
+using NUnit.Framework;
+using Python.Runtime;
+
+namespace Python.EmbeddingTest
+{
+    public class TestPythonEngineProperties
+    {
+        [Test]
+        public static void GetBuildinfoDoesntCrash()
+        {
+            using (Py.GIL())
+            {
+                string s = PythonEngine.BuildInfo;
+
+                Assert.IsTrue(s.Length > 5);
+                Assert.IsTrue(s.Contains(","));
+            }
+        }
+
+        [Test]
+        public static void GetCompilerDoesntCrash()
+        {
+            using (Py.GIL())
+            {
+                string s = PythonEngine.Compiler;
+
+                Assert.IsTrue(s.Length > 0);
+                Assert.IsTrue(s.Contains("["));
+                Assert.IsTrue(s.Contains("]"));
+            }
+        }
+
+        [Test]
+        public static void GetCopyrightDoesntCrash()
+        {
+            using (Py.GIL())
+            {
+                string s = PythonEngine.Copyright;
+
+                Assert.IsTrue(s.Length > 0);
+                Assert.IsTrue(s.Contains("Python Software Foundation"));
+            }
+        }
+
+        [Test]
+        public static void GetPlatformDoesntCrash()
+        {
+            using (Py.GIL())
+            {
+                string s = PythonEngine.Platform;
+
+                Assert.IsTrue(s.Length > 0);
+                Assert.IsTrue(s.Contains("x") || s.Contains("win"));
+            }
+        }
+
+        [Test]
+        public static void GetVersionDoesntCrash()
+        {
+            using (Py.GIL())
+            {
+                string s = PythonEngine.Version;
+
+                Assert.IsTrue(s.Length > 0);
+                Assert.IsTrue(s.Contains(","));
+            }
+        }
+    }
+}
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices;
 
 namespace Python.Runtime
 {
@@ -96,22 +97,27 @@ public static string PythonPath
 
         public static string Version
         {
-            get { return Runtime.Py_GetVersion(); }
+            get { return Marshal.PtrToStringAnsi(Runtime.Py_GetVersion()); }
         }
 
         public static string BuildInfo
         {
-            get { return Runtime.Py_GetBuildInfo(); }
+            get { return Marshal.PtrToStringAnsi(Runtime.Py_GetBuildInfo()); }
         }
 
         public static string Platform
         {
-            get { return Runtime.Py_GetPlatform(); }
+            get { return Marshal.PtrToStringAnsi(Runtime.Py_GetPlatform()); }
         }
 
         public static string Copyright
         {
-            get { return Runtime.Py_GetCopyright(); }
+            get { return Marshal.PtrToStringAnsi(Runtime.Py_GetCopyright()); }
+        }
+
+        public static string Compiler
+        {
+            get { return Marshal.PtrToStringAnsi(Runtime.Py_GetCompiler()); }
         }
 
         public static int RunSimpleString(string code)
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -729,19 +729,19 @@ internal static extern void Py_SetPath(
 #endif
 
         [DllImport(PythonDll)]
-        internal static extern string Py_GetVersion();
+        internal static extern IntPtr Py_GetVersion();
 
         [DllImport(PythonDll)]
-        internal static extern string Py_GetPlatform();
+        internal static extern IntPtr Py_GetPlatform();
 
         [DllImport(PythonDll)]
-        internal static extern string Py_GetCopyright();
+        internal static extern IntPtr Py_GetCopyright();
 
         [DllImport(PythonDll)]
-        internal static extern string Py_GetCompiler();
+        internal static extern IntPtr Py_GetCompiler();
 
         [DllImport(PythonDll)]
-        internal static extern string Py_GetBuildInfo();
+        internal static extern IntPtr Py_GetBuildInfo();
 
         [DllImport(PythonDll)]
         internal static extern int PyRun_SimpleString(string code);

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.IO;`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using System.Reflection;`
	`6`	`+using System.Runtime.InteropServices;`
`6`	`7`
`7`	`8`	`namespace Python.Runtime`
`8`	`9`	`{`
`@@ -96,22 +97,27 @@ public static string PythonPath`
`96`	`97`
`97`	`98`	`public static string Version`
`98`	`99`	`{`
`99`		`- get { return Runtime.Py_GetVersion(); }`
	`100`	`+ get { return Marshal.PtrToStringAnsi(Runtime.Py_GetVersion()); }`
`100`	`101`	`}`
`101`	`102`
`102`	`103`	`public static string BuildInfo`
`103`	`104`	`{`
`104`		`- get { return Runtime.Py_GetBuildInfo(); }`
	`105`	`+ get { return Marshal.PtrToStringAnsi(Runtime.Py_GetBuildInfo()); }`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`public static string Platform`
`108`	`109`	`{`
`109`		`- get { return Runtime.Py_GetPlatform(); }`
	`110`	`+ get { return Marshal.PtrToStringAnsi(Runtime.Py_GetPlatform()); }`
`110`	`111`	`}`
`111`	`112`
`112`	`113`	`public static string Copyright`
`113`	`114`	`{`
`114`		`- get { return Runtime.Py_GetCopyright(); }`
	`115`	`+ get { return Marshal.PtrToStringAnsi(Runtime.Py_GetCopyright()); }`
	`116`	`+ }`
	`117`	`+`
	`118`	`+ public static string Compiler`
	`119`	`+ {`
	`120`	`+ get { return Marshal.PtrToStringAnsi(Runtime.Py_GetCompiler()); }`
`115`	`121`	`}`
`116`	`122`
`117`	`123`	`public static int RunSimpleString(string code)`