Fix Py_SetPath not available in PY2

vmuriart · vmuriart · commit 7db41a9eaca9 · 2017-03-03T22:10:41.000-07:00
Closes #418
diff --git a/src/embed_tests/TestPythonEngineProperties.cs b/src/embed_tests/TestPythonEngineProperties.cs
@@ -142,5 +142,46 @@ public void SetProgramName()
             Assert.AreEqual(programName, PythonEngine.ProgramName);
             PythonEngine.Shutdown();
         }
+
+        [Test]
+        public void SetPythonPath()
+        {
+            if (Runtime.Runtime.pyversion == "2.7")
+            {
+                // Assert.Skip outputs as a warning (ie. pending to fix)
+                Assert.Pass();
+            }
+
+            PythonEngine.Initialize();
+            string path = PythonEngine.PythonPath;
+            PythonEngine.Shutdown();
+
+            PythonEngine.ProgramName = path;
+            PythonEngine.Initialize();
+
+            Assert.AreEqual(path, PythonEngine.PythonPath);
+            PythonEngine.Shutdown();
+        }
+
+        [Test]
+        public void SetPythonPathExceptionOn27()
+        {
+            if (Runtime.Runtime.pyversion != "2.7")
+            {
+                Assert.Pass();
+            }
+
+            // Get previous path to avoid crashing Python
+            PythonEngine.Initialize();
+            string path = PythonEngine.PythonPath;
+            PythonEngine.Shutdown();
+
+            var ex = Assert.Throws<NotSupportedException>(() => PythonEngine.PythonPath = "foo");
+            Assert.AreEqual("Set PythonPath not supported on Python 2", ex.Message);
+
+            PythonEngine.Initialize();
+            Assert.AreEqual(path, PythonEngine.PythonPath);
+            PythonEngine.Shutdown();
+        }
     }
 }
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -95,6 +95,10 @@ public static string PythonPath
             }
             set
             {
+                if (Runtime.IsPython2)
+                {
+                    throw new NotSupportedException("Set PythonPath not supported on Python 2");
+                }
                 Marshal.FreeHGlobal(_pythonPath);
                 _pythonPath = UcsMarshaler.Py3UnicodePy2StringtoPtr(value);
                 Runtime.Py_SetPath(_pythonPath);

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,10 @@ public static string PythonPath`
`95`	`95`	`}`
`96`	`96`	`set`
`97`	`97`	`{`
	`98`	`+ if (Runtime.IsPython2)`
	`99`	`+ {`
	`100`	`+ throw new NotSupportedException("Set PythonPath not supported on Python 2");`
	`101`	`+ }`
`98`	`102`	`Marshal.FreeHGlobal(_pythonPath);`
`99`	`103`	`_pythonPath = UcsMarshaler.Py3UnicodePy2StringtoPtr(value);`
`100`	`104`	`Runtime.Py_SetPath(_pythonPath);`