Fix set PythonPath, set ProgramName

vmuriart · vmuriart · commit 321aa28ba622 · 2017-03-02T22:47:34.000-07:00
Note on PythonPath. Its actually mapping to `Py_SetPath` which is
very different from PYTHONPATH env var. There is no test on it
because it should be set to real paths with libraries. Otherwise it
crashes.

2nd Note. `Py_SetPath` doesn't exist on PY27.
diff --git a/src/embed_tests/TestPythonEngineProperties.cs b/src/embed_tests/TestPythonEngineProperties.cs
@@ -130,5 +130,17 @@ public void SetPythonHomeTwice()
             Assert.AreEqual(pythonHome, PythonEngine.PythonHome);
             PythonEngine.Shutdown();
         }
+
+        [Test]
+        public void SetProgramName()
+        {
+            var programName = "FooBar";
+
+            PythonEngine.ProgramName = programName;
+            PythonEngine.Initialize();
+
+            Assert.AreEqual(programName, PythonEngine.ProgramName);
+            PythonEngine.Shutdown();
+        }
     }
 }
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -15,6 +15,8 @@ public class PythonEngine : IDisposable
         private static DelegateManager delegateManager;
         private static bool initialized;
         private static IntPtr _pythonHome = IntPtr.Zero;
+        private static IntPtr _programName = IntPtr.Zero;
+        private static IntPtr _pythonPath = IntPtr.Zero;
 
         public PythonEngine()
         {
@@ -65,7 +67,14 @@ public static string ProgramName
 
                 return result ?? "";
             }
-            set { Runtime.Py_SetProgramName(value); }
+            set
+            {
+                Marshal.FreeHGlobal(_programName);
+                _programName = Runtime.IsPython3
+                    ? UcsMarshaler.GetInstance("").MarshalManagedToNative(value)
+                    : Marshal.StringToHGlobalAnsi(value);
+                Runtime.Py_SetProgramName(_programName);
+            }
         }
 
         public static string PythonHome
@@ -81,10 +90,7 @@ public static string PythonHome
             }
             set
             {
-                if (_pythonHome != IntPtr.Zero)
-                {
-                    Marshal.FreeHGlobal(_pythonHome);
-                }
+                Marshal.FreeHGlobal(_pythonHome);
                 _pythonHome = Runtime.IsPython3
                     ? UcsMarshaler.GetInstance("").MarshalManagedToNative(value)
                     : Marshal.StringToHGlobalAnsi(value);
@@ -103,7 +109,14 @@ public static string PythonPath
 
                 return result ?? "";
             }
-            set { Runtime.Py_SetPath(value); }
+            set
+            {
+                Marshal.FreeHGlobal(_pythonPath);
+                _pythonPath = Runtime.IsPython3
+                    ? UcsMarshaler.GetInstance("").MarshalManagedToNative(value)
+                    : Marshal.StringToHGlobalAnsi(value);
+                Runtime.Py_SetPath(_pythonPath);
+            }
         }
 
         public static string Version
@@ -297,6 +310,11 @@ public static void Shutdown()
             {
                 Marshal.FreeHGlobal(_pythonHome);
                 _pythonHome = IntPtr.Zero;
+                Marshal.FreeHGlobal(_programName);
+                _programName = IntPtr.Zero;
+                Marshal.FreeHGlobal(_pythonPath);
+                _pythonPath = IntPtr.Zero;
+
                 Runtime.Shutdown();
                 initialized = false;
             }
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -686,9 +686,7 @@ public static extern int Py_Main(
         internal static extern IntPtr Py_GetProgramName();
 
         [DllImport(PythonDll)]
-        internal static extern void Py_SetProgramName(
-            [MarshalAs(UnmanagedType.LPWStr)] string name
-        );
+        internal static extern void Py_SetProgramName(IntPtr name);
 
         [DllImport(PythonDll)]
         internal static extern IntPtr Py_GetPythonHome();
@@ -700,15 +698,13 @@ internal static extern void Py_SetProgramName(
         internal static extern IntPtr Py_GetPath();
 
         [DllImport(PythonDll)]
-        internal static extern void Py_SetPath(
-            [MarshalAs(UnmanagedType.LPWStr)] string home
-        );
+        internal static extern void Py_SetPath(IntPtr home);
 #elif PYTHON2
         [DllImport(PythonDll)]
         internal static extern IntPtr Py_GetProgramName();
 
         [DllImport(PythonDll)]
-        internal static extern void Py_SetProgramName(string name);
+        internal static extern void Py_SetProgramName(IntPtr name);
 
         [DllImport(PythonDll)]
         internal static extern IntPtr Py_GetPythonHome();
@@ -720,7 +716,7 @@ internal static extern void Py_SetPath(
         internal static extern IntPtr Py_GetPath();
 
         [DllImport(PythonDll)]
-        internal static extern void Py_SetPath(string home);
+        internal static extern void Py_SetPath(IntPtr home);
 #endif
 
         [DllImport(PythonDll)]

Original file line number	Diff line number	Diff line change
`@@ -130,5 +130,17 @@ public void SetPythonHomeTwice()`
`130`	`130`	`Assert.AreEqual(pythonHome, PythonEngine.PythonHome);`
`131`	`131`	`PythonEngine.Shutdown();`
`132`	`132`	`}`
	`133`	`+`
	`134`	`+ [Test]`
	`135`	`+ public void SetProgramName()`
	`136`	`+ {`
	`137`	`+ var programName = "FooBar";`
	`138`	`+`
	`139`	`+ PythonEngine.ProgramName = programName;`
	`140`	`+ PythonEngine.Initialize();`
	`141`	`+`
	`142`	`+ Assert.AreEqual(programName, PythonEngine.ProgramName);`
	`143`	`+ PythonEngine.Shutdown();`
	`144`	`+ }`
`133`	`145`	`}`
`134`	`146`	`}`