Fix Python 2 compatibility.

filmor · filmor · commit d2bfa4995258 · 2016-11-08T15:06:20.000+01:00
diff --git a/src/runtime/interop.cs b/src/runtime/interop.cs
@@ -89,41 +89,35 @@ static ObjectOffset()
 
         public static int magic(IntPtr ob)
         {
-#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
             if ((Runtime.PyObject_TypeCheck(ob, Exceptions.BaseException) ||
                 (Runtime.PyType_Check(ob) && Runtime.PyType_IsSubtype(ob, Exceptions.BaseException))))
             {
                 return ExceptionOffset.ob_data;
             }
-#endif
             return ob_data;
         }
 
         public static int DictOffset(IntPtr ob)
         {
-#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
             if ((Runtime.PyObject_TypeCheck(ob, Exceptions.BaseException) ||
                 (Runtime.PyType_Check(ob) && Runtime.PyType_IsSubtype(ob, Exceptions.BaseException))))
             {
                 return ExceptionOffset.ob_dict;
             }
-#endif
             return ob_dict;
         }
 
         public static int Size(IntPtr ob)
         {
-#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
             if ((Runtime.PyObject_TypeCheck(ob, Exceptions.BaseException) ||
                 (Runtime.PyType_Check(ob) && Runtime.PyType_IsSubtype(ob, Exceptions.BaseException))))
             {
                 return ExceptionOffset.Size();
             }
-#endif
 #if (Py_DEBUG)
             return 6 * IntPtr.Size;
 #else
-            return 4*IntPtr.Size;
+            return 4 * IntPtr.Size;
 #endif
         }
 
@@ -137,7 +131,6 @@ public static int Size(IntPtr ob)
         private static int ob_data;
     }
 
-#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
     internal class ExceptionOffset
     {
@@ -161,15 +154,21 @@ public static int Size()
         // (start after PyObject_HEAD)
         public static int dict = 0;
         public static int args = 0;
+#if (PYTHON25 || PYTHON26 || PYTHON27)
+        public static int message = 0;
+#elif (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
         public static int traceback = 0;
         public static int context = 0;
         public static int cause = 0;
+#if !PYTHON32
+        public static int suppress_context = 0;
+#endif
+#endif
 
         // extra c# data
         public static int ob_dict;
         public static int ob_data;
     }
-#endif
 
 
 #if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)

Original file line number	Diff line number	Diff line change
`@@ -89,41 +89,35 @@ static ObjectOffset()`
`89`	`89`
`90`	`90`	`public static int magic(IntPtr ob)`
`91`	`91`	`{`
`92`		`-#if (PYTHON32 \|\| PYTHON33 \|\| PYTHON34 \|\| PYTHON35)`
`93`	`92`	`if ((Runtime.PyObject_TypeCheck(ob, Exceptions.BaseException) \|\|`
`94`	`93`	`(Runtime.PyType_Check(ob) && Runtime.PyType_IsSubtype(ob, Exceptions.BaseException))))`
`95`	`94`	`{`
`96`	`95`	`return ExceptionOffset.ob_data;`
`97`	`96`	`}`
`98`		`-#endif`
`99`	`97`	`return ob_data;`
`100`	`98`	`}`
`101`	`99`
`102`	`100`	`public static int DictOffset(IntPtr ob)`
`103`	`101`	`{`
`104`		`-#if (PYTHON32 \|\| PYTHON33 \|\| PYTHON34 \|\| PYTHON35)`
`105`	`102`	`if ((Runtime.PyObject_TypeCheck(ob, Exceptions.BaseException) \|\|`
`106`	`103`	`(Runtime.PyType_Check(ob) && Runtime.PyType_IsSubtype(ob, Exceptions.BaseException))))`
`107`	`104`	`{`
`108`	`105`	`return ExceptionOffset.ob_dict;`
`109`	`106`	`}`
`110`		`-#endif`
`111`	`107`	`return ob_dict;`
`112`	`108`	`}`
`113`	`109`
`114`	`110`	`public static int Size(IntPtr ob)`
`115`	`111`	`{`
`116`		`-#if (PYTHON32 \|\| PYTHON33 \|\| PYTHON34 \|\| PYTHON35)`
`117`	`112`	`if ((Runtime.PyObject_TypeCheck(ob, Exceptions.BaseException) \|\|`
`118`	`113`	`(Runtime.PyType_Check(ob) && Runtime.PyType_IsSubtype(ob, Exceptions.BaseException))))`
`119`	`114`	`{`
`120`	`115`	`return ExceptionOffset.Size();`
`121`	`116`	`}`
`122`		`-#endif`
`123`	`117`	`#if (Py_DEBUG)`
`124`	`118`	`return 6 * IntPtr.Size;`
`125`	`119`	`#else`
`126`		`- return 4*IntPtr.Size;`
	`120`	`+ return 4 * IntPtr.Size;`
`127`	`121`	`#endif`
`128`	`122`	`}`
`129`	`123`
`@@ -137,7 +131,6 @@ public static int Size(IntPtr ob)`
`137`	`131`	`private static int ob_data;`
`138`	`132`	`}`
`139`	`133`
`140`		`-#if (PYTHON32 \|\| PYTHON33 \|\| PYTHON34 \|\| PYTHON35)`
`141`	`134`	`[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]`
`142`	`135`	`internal class ExceptionOffset`
`143`	`136`	`{`
`@@ -161,15 +154,21 @@ public static int Size()`
`161`	`154`	`// (start after PyObject_HEAD)`
`162`	`155`	`public static int dict = 0;`
`163`	`156`	`public static int args = 0;`
	`157`	`+#if (PYTHON25 \|\| PYTHON26 \|\| PYTHON27)`
	`158`	`+ public static int message = 0;`
	`159`	`+#elif (PYTHON32 \|\| PYTHON33 \|\| PYTHON34 \|\| PYTHON35)`
`164`	`160`	`public static int traceback = 0;`
`165`	`161`	`public static int context = 0;`
`166`	`162`	`public static int cause = 0;`
	`163`	`+#if !PYTHON32`
	`164`	`+ public static int suppress_context = 0;`
	`165`	`+#endif`
	`166`	`+#endif`
`167`	`167`
`168`	`168`	`// extra c# data`
`169`	`169`	`public static int ob_dict;`
`170`	`170`	`public static int ob_data;`
`171`	`171`	`}`
`172`		`-#endif`
`173`	`172`
`174`	`173`
`175`	`174`	`#if (PYTHON32 \|\| PYTHON33 \|\| PYTHON34 \|\| PYTHON35)`