added Runtime.PyType_IsSameAsOrSubtype

lostmsu · lostmsu · commit b480a0cec4e0 · 2019-11-20T18:45:42.000-08:00
diff --git a/src/runtime/interop.cs b/src/runtime/interop.cs
@@ -184,8 +184,8 @@ public static int Size(IntPtr pyType)
         private static bool IsException(IntPtr pyObject)
         {
             var type = Runtime.PyObject_TYPE(pyObject);
-            return Runtime.PyObjectType_TypeCheck(type, Exceptions.BaseException)
-                || Runtime.PyObjectType_TypeCheck(type, Runtime.PyTypeType)
+            return Runtime.PyType_IsSameAsOrSubtype(type, ofType: Exceptions.BaseException)
+                || Runtime.PyType_IsSameAsOrSubtype(type, ofType: Runtime.PyTypeType)
                 && Runtime.PyType_IsSubtype(pyObject, Exceptions.BaseException);
         }
     }
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -1771,6 +1771,11 @@ internal static bool PyObject_TypeCheck(IntPtr ob, IntPtr tp)
             return (t == tp) || PyType_IsSubtype(t, tp);
         }
 
+        internal static bool PyType_IsSameAsOrSubtype(IntPtr type, IntPtr ofType)
+        {
+            return (type == ofType) || PyType_IsSubtype(type, ofType);
+        }
+
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern IntPtr PyType_GenericNew(IntPtr type, IntPtr args, IntPtr kw);
 

Original file line number	Diff line number	Diff line change
`@@ -184,8 +184,8 @@ public static int Size(IntPtr pyType)`
`184`	`184`	`private static bool IsException(IntPtr pyObject)`
`185`	`185`	`{`
`186`	`186`	`var type = Runtime.PyObject_TYPE(pyObject);`
`187`		`- return Runtime.PyObjectType_TypeCheck(type, Exceptions.BaseException)`
`188`		`- \|\| Runtime.PyObjectType_TypeCheck(type, Runtime.PyTypeType)`
	`187`	`+ return Runtime.PyType_IsSameAsOrSubtype(type, ofType: Exceptions.BaseException)`
	`188`	`+ \|\| Runtime.PyType_IsSameAsOrSubtype(type, ofType: Runtime.PyTypeType)`
`189`	`189`	`&& Runtime.PyType_IsSubtype(pyObject, Exceptions.BaseException);`
`190`	`190`	`}`
`191`	`191`	`}`