Commit 7bc2495
committed
Switch to using TrueDivide instead of Divide everywhere
Fixes pythonnet#802.
TrueDivide is supported in both Python 2 and 3 while Divide exists only
in Python 2. This does mean that a simple division of numbers will
behave differently in C# vs Python for Python 2, but it will at least
behave the same way in C# independent of the Python version being used.1 parent d3ca2e8 commit 7bc2495
2 files changed
Lines changed: 8 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -101,7 +101,7 @@ public object AsManagedObject(Type t) | |||
| 101 | 101 | } | |
| 102 | 102 | return result; | |
| 103 | 103 | } | |
| 104 | - | ||
| 104 | + | ||
| 105 | 105 | /// <summary> | |
| 106 | 106 | /// As Method | |
| 107 | 107 | /// </summary> | |
@@ -1121,10 +1121,10 @@ public override bool TryBinaryOperation(BinaryOperationBinder binder, object arg | |||
| 1121 | 1121 | res = Runtime.PyNumber_InPlaceMultiply(this.obj, ((PyObject)arg).obj); | |
| 1122 | 1122 | break; | |
| 1123 | 1123 | case ExpressionType.Divide: | |
| 1124 | - res = Runtime.PyNumber_Divide(this.obj, ((PyObject)arg).obj); | ||
| 1124 | + res = Runtime.PyNumber_TrueDivide(this.obj, ((PyObject)arg).obj); | ||
| 1125 | 1125 | break; | |
| 1126 | 1126 | case ExpressionType.DivideAssign: | |
| 1127 | - res = Runtime.PyNumber_InPlaceDivide(this.obj, ((PyObject)arg).obj); | ||
| 1127 | + res = Runtime.PyNumber_InPlaceTrueDivide(this.obj, ((PyObject)arg).obj); | ||
| 1128 | 1128 | break; | |
| 1129 | 1129 | case ExpressionType.And: | |
| 1130 | 1130 | res = Runtime.PyNumber_And(this.obj, ((PyObject)arg).obj); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -105,7 +105,7 @@ public static IntPtr GetProcAddress(IntPtr dllHandle, string name) | |||
| 105 | 105 | public class Runtime | |
| 106 | 106 | { | |
| 107 | 107 | // C# compiler copies constants to the assemblies that references this library. | |
| 108 | - // We needs to replace all public constants to static readonly fields to allow | ||
| 108 | + // We needs to replace all public constants to static readonly fields to allow | ||
| 109 | 109 | // binary substitution of different Python.Runtime.dll builds in a target application. | |
| 110 | 110 | ||
| 111 | 111 | public static int UCS => _UCS; | |
@@ -131,7 +131,7 @@ public class Runtime | |||
| 131 | 131 | #endif | |
| 132 | 132 | ||
| 133 | 133 | // C# compiler copies constants to the assemblies that references this library. | |
| 134 | - // We needs to replace all public constants to static readonly fields to allow | ||
| 134 | + // We needs to replace all public constants to static readonly fields to allow | ||
| 135 | 135 | // binary substitution of different Python.Runtime.dll builds in a target application. | |
| 136 | 136 | ||
| 137 | 137 | public static string pyversion => _pyversion; | |
@@ -174,7 +174,7 @@ public class Runtime | |||
| 174 | 174 | #endif | |
| 175 | 175 | ||
| 176 | 176 | // C# compiler copies constants to the assemblies that references this library. | |
| 177 | - // We needs to replace all public constants to static readonly fields to allow | ||
| 177 | + // We needs to replace all public constants to static readonly fields to allow | ||
| 178 | 178 | // binary substitution of different Python.Runtime.dll builds in a target application. | |
| 179 | 179 | ||
| 180 | 180 | public static readonly string PythonDLL = _PythonDll; | |
@@ -1188,7 +1188,7 @@ internal static bool PyFloat_Check(IntPtr ob) | |||
| 1188 | 1188 | internal static extern IntPtr PyNumber_Multiply(IntPtr o1, IntPtr o2); | |
| 1189 | 1189 | ||
| 1190 | 1190 | [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)] | |
| 1191 | - internal static extern IntPtr PyNumber_Divide(IntPtr o1, IntPtr o2); | ||
| 1191 | + internal static extern IntPtr PyNumber_TrueDivide(IntPtr o1, IntPtr o2); | ||
| 1192 | 1192 | ||
| 1193 | 1193 | [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)] | |
| 1194 | 1194 | internal static extern IntPtr PyNumber_And(IntPtr o1, IntPtr o2); | |
@@ -1221,7 +1221,7 @@ internal static bool PyFloat_Check(IntPtr ob) | |||
| 1221 | 1221 | internal static extern IntPtr PyNumber_InPlaceMultiply(IntPtr o1, IntPtr o2); | |
| 1222 | 1222 | ||
| 1223 | 1223 | [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)] | |
| 1224 | - internal static extern IntPtr PyNumber_InPlaceDivide(IntPtr o1, IntPtr o2); | ||
| 1224 | + internal static extern IntPtr PyNumber_InPlaceTrueDivide(IntPtr o1, IntPtr o2); | ||
| 1225 | 1225 | ||
| 1226 | 1226 | [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)] | |
| 1227 | 1227 | internal static extern IntPtr PyNumber_InPlaceAnd(IntPtr o1, IntPtr o2); | |
0 commit comments