Enable isinstance to work with PyJClass.

ninia · Nov 30, 2022 · 9083c70 · 9083c70
1 parent d8cd41b
commit 9083c70
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 2 deletions.
diff --git a/src/main/c/Objects/pyjclass.c b/src/main/c/Objects/pyjclass.c
@@ -392,13 +392,58 @@ static int pyjclass_setattro(PyObject *obj, PyObject *name, PyObject *v)
     return pyjfield_set((PyJFieldObject *) cur, pyjobj, v);
 }
 
-
 static PyTypeObject* pyjclass_GetPyType(PyJClassObject* self)
 {
     JNIEnv* env = pyembed_get_env();
     return PyJType_Get(env, self->clazz);
 }
 
+static PyObject* pyjclass_IsInstance(PyJClassObject* self, PyObject* inst)
+{
+    PyObject* type = (PyObject*) pyjclass_GetPyType(self);
+    if (!type) {
+        return NULL;
+    }
+    int result = PyObject_IsInstance(inst, type);
+    Py_DECREF(type);
+    return PyBool_FromLong(result);
+}
+
+static PyObject* pyjclass_IsSubclass(PyJClassObject* self, PyObject* sub)
+{
+    PyObject* type = (PyObject*) pyjclass_GetPyType(self);
+    if (!type) {
+        return NULL;
+    }
+    int result;
+    if (PyJClass_Check(sub)) {
+        PyObject* subtype = (PyObject*) pyjclass_GetPyType((PyJClassObject*) sub);
+        if (!subtype) {
+            Py_DECREF(type);
+            return NULL;
+        }
+        result = PyObject_IsSubclass(subtype, type);
+        Py_DECREF(subtype);
+    } else {
+        result = PyObject_IsSubclass(sub, type);
+    }
+    Py_DECREF(type);
+    return PyBool_FromLong(result);
+}
+
+PyMethodDef pyjclass_methods[] = {
+    {
+        "__instancecheck__",
+        (PyCFunction) pyjclass_IsInstance, METH_O, NULL
+    },
+    {
+        "__subclasscheck__",
+        (PyCFunction) pyjclass_IsSubclass, METH_O, NULL
+    },
+    { NULL, NULL }
+};
+
+
 static PyMemberDef pyjclass_members[] = {
     {"__dict__", T_OBJECT, offsetof(PyJClassObject, attr), READONLY},
     {0}
@@ -437,7 +482,7 @@ PyTypeObject PyJClass_Type = {
     0,                                        /* tp_weaklistoffset */
     0,                                        /* tp_iter */
     0,                                        /* tp_iternext */
-    0,                                        /* tp_methods */
+    pyjclass_methods,                         /* tp_methods */
     pyjclass_members,                         /* tp_members */
     pyjclass_getset,                          /* tp_getset */
     0, // &PyJObject_Type                     /* tp_base */

diff --git a/src/test/python/test_import.py b/src/test/python/test_import.py
@@ -57,4 +57,10 @@ def test_type_inheritance(self):
         from java.util import Date
         self.assertTrue(isinstance(Date(), Object.__pytype__))
         self.assertTrue(isinstance(Date(), Serializable.__pytype__))
+        self.assertTrue(issubclass(Date.__pytype__, Object.__pytype__))
+        self.assertTrue(issubclass(Date.__pytype__, Serializable.__pytype__))
+        self.assertTrue(isinstance(Date(), Object))
+        self.assertTrue(isinstance(Date(), Serializable))
+        self.assertTrue(issubclass(Date, Object))
+        self.assertTrue(issubclass(Date, Serializable))