Stop using Runtime.IsPython2/3

filmor · koubaa · commit 7d6c4ace590b · 2020-04-16T21:20:28.000-05:00
Contrary to what I said before, I don't think trying to provide
a single DLL for Python 2 and 3. We will in the future default
to Python 3, and if someone really wants Python 2, for a while
we will support a separate compile configuration for that.
diff --git a/src/embed_tests/TestCallbacks.cs b/src/embed_tests/TestCallbacks.cs
@@ -25,9 +25,12 @@ public void TestNoOverloadException() {
                 dynamic callWith42 = PythonEngine.Eval("lambda f: f([42])");
                 var error =  Assert.Throws<PythonException>(() => callWith42(aFunctionThatCallsIntoPython.ToPython()));
                 Assert.AreEqual("TypeError", error.PythonTypeName);
-                string expectedArgTypes = Runtime.IsPython2
-                    ? "(<type 'list'>)"
-                    : "(<class 'list'>)";
+                string expectedArgTypes =
+#if PYTHON2
+                    "(<type 'list'>)";
+#else
+                    "(<class 'list'>)";
+#endif
                 StringAssert.EndsWith(expectedArgTypes, error.Message);
             }
         }
diff --git a/src/runtime/CustomMarshaler.cs b/src/runtime/CustomMarshaler.cs
@@ -120,9 +120,11 @@ public static int GetUnicodeByteLength(IntPtr p)
         /// </remarks>
         public static IntPtr Py3UnicodePy2StringtoPtr(string s)
         {
-            return Runtime.IsPython3
-                ? Instance.MarshalManagedToNative(s)
-                : Marshal.StringToHGlobalAnsi(s);
+#if PYTHON2
+            return Marshal.StringToHGlobalAnsi(s);
+#else
+            return Instance.MarshalManagedToNative(s);
+#endif
         }
 
         /// <summary>
@@ -137,9 +139,11 @@ public static IntPtr Py3UnicodePy2StringtoPtr(string s)
         /// </returns>
         public static string PtrToPy3UnicodePy2String(IntPtr p)
         {
-            return Runtime.IsPython3
-                ? PtrToStringUni(p)
-                : Marshal.PtrToStringAnsi(p);
+#if PYTHON2
+            return Marshal.PtrToStringAnsi(p);
+#else
+            return PtrToStringUni(p);
+#endif
         }
     }
 
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -86,8 +86,10 @@ internal static IntPtr GetPythonTypeByAlias(Type op)
             if (op == int32Type)
                 return Runtime.PyIntType;
 
-            if (op == int64Type && Runtime.IsPython2)
+#if PYTHON2
+            if (op == int64Type)
                 return Runtime.PyLongType;
+#endif
 
             if (op == int64Type)
                 return Runtime.PyIntType;
@@ -488,8 +490,9 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo
                     return true;
 
                 case TypeCode.Int32:
+#if PYTHON2
                     // Trickery to support 64-bit platforms.
-                    if (Runtime.IsPython2 && Runtime.Is32Bit)
+                    if (Runtime.Is32Bit)
                     {
                         op = Runtime.PyNumber_Int(value);
 
@@ -513,7 +516,8 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo
                         result = ival;
                         return true;
                     }
-                    else // Python3 always use PyLong API
+#else
+                    // Python3 always use PyLong API
                     {
                         op = Runtime.PyNumber_Long(value);
                         if (op == IntPtr.Zero)
@@ -538,6 +542,7 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo
                         result = (int)ll;
                         return true;
                     }
+#endif
 
                 case TypeCode.Boolean:
                     result = Runtime.PyObject_IsTrue(value) != 0;
diff --git a/src/runtime/exceptions.cs b/src/runtime/exceptions.cs
@@ -103,7 +103,12 @@ private Exceptions()
         /// </summary>
         internal static void Initialize()
         {
-            string exceptionsModuleName = Runtime.IsPython3 ? "builtins" : "exceptions";
+            string exceptionsModuleName =
+#if PYTHON2
+            "exceptions";
+#else
+            "builtins";
+#endif
             exceptions_module = Runtime.PyImport_ImportModule(exceptionsModuleName);
 
             Exceptions.ErrorCheck(exceptions_module);
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -32,7 +32,6 @@ internal static void ReleaseModuleDef()
             ModuleDefOffset.FreeModuleDef(module_def);
             module_def = IntPtr.Zero;
         }
-#endif
 
         /// <summary>
         /// Initialize just the __import__ hook itself.
@@ -136,11 +135,10 @@ public static IntPtr GetCLRModule(IntPtr? fromList = null)
         {
             root.InitializePreload();
 
-            if (Runtime.IsPython2)
-            {
-                Runtime.XIncref(py_clr_module);
-                return py_clr_module;
-            }
+#if PYTHON2
+            Runtime.XIncref(py_clr_module);
+            return py_clr_module;
+#endif
 
             // Python 3
             // update the module dictionary with the contents of the root dictionary
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -95,13 +95,13 @@ public static string PythonPath
             }
             set
             {
-                if (Runtime.IsPython2)
-                {
-                    throw new NotSupportedException("Set PythonPath not supported on Python 2");
-                }
+#if PYTHON2
+                throw new NotSupportedException("Set PythonPath not supported on Python 2");
+#else
                 Marshal.FreeHGlobal(_pythonPath);
                 _pythonPath = UcsMarshaler.Py3UnicodePy2StringtoPtr(value);
                 Runtime.Py_SetPath(_pythonPath);
+#endif
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -120,9 +120,11 @@ public static int GetUnicodeByteLength(IntPtr p)`
`120`	`120`	`/// </remarks>`
`121`	`121`	`public static IntPtr Py3UnicodePy2StringtoPtr(string s)`
`122`	`122`	`{`
`123`		`- return Runtime.IsPython3`
`124`		`- ? Instance.MarshalManagedToNative(s)`
`125`		`- : Marshal.StringToHGlobalAnsi(s);`
	`123`	`+#if PYTHON2`
	`124`	`+ return Marshal.StringToHGlobalAnsi(s);`
	`125`	`+#else`
	`126`	`+ return Instance.MarshalManagedToNative(s);`
	`127`	`+#endif`
`126`	`128`	`}`
`127`	`129`
`128`	`130`	`/// <summary>`
`@@ -137,9 +139,11 @@ public static IntPtr Py3UnicodePy2StringtoPtr(string s)`
`137`	`139`	`/// </returns>`
`138`	`140`	`public static string PtrToPy3UnicodePy2String(IntPtr p)`
`139`	`141`	`{`
`140`		`- return Runtime.IsPython3`
`141`		`- ? PtrToStringUni(p)`
`142`		`- : Marshal.PtrToStringAnsi(p);`
	`142`	`+#if PYTHON2`
	`143`	`+ return Marshal.PtrToStringAnsi(p);`
	`144`	`+#else`
	`145`	`+ return PtrToStringUni(p);`
	`146`	`+#endif`
`143`	`147`	`}`
`144`	`148`	`}`
`145`	`149`
Original file line number	Diff line number	Diff line change
`@@ -95,13 +95,13 @@ 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`	`+#if PYTHON2`
	`99`	`+ throw new NotSupportedException("Set PythonPath not supported on Python 2");`
	`100`	`+#else`
`102`	`101`	`Marshal.FreeHGlobal(_pythonPath);`
`103`	`102`	`_pythonPath = UcsMarshaler.Py3UnicodePy2StringtoPtr(value);`
`104`	`103`	`Runtime.Py_SetPath(_pythonPath);`
	`104`	`+#endif`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`