Update repr test after rebase, add check for repr in attr

ninia · Sep 3, 2021 · 87753ab · 87753ab
1 parent 6589210
commit 87753ab
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/src/main/c/Objects/pyjobject.c b/src/main/c/Objects/pyjobject.c
@@ -287,25 +287,28 @@ static PyObject* pyjobject_repr(PyJObject *self)
 
     //check if __repr__ method exists on java object
     if (self->object && self->clazz) {
-        env   = pyembed_get_env();
+        PyObject *repr = PyDict_GetItemString(self->attr, "__repr__");
+        if (repr) {
+            env   = pyembed_get_env();
 
-        Py_BEGIN_ALLOW_THREADS
-        if (JNI_METHOD(__repr__, env, self->clazz, "__repr__", "()Ljava/lang/String;")) {
-            jrepr = (jstring) (*env)->CallObjectMethod(env, self->object, __repr__);
-        } else {
-            //method does not exist, clear exception
-            if ((*env)->ExceptionCheck(env)) {
-                (*env)->ExceptionClear(env);
+            Py_BEGIN_ALLOW_THREADS
+            if (JNI_METHOD(__repr__, env, self->clazz, "__repr__", "()Ljava/lang/String;")) {
+                jrepr = (jstring) (*env)->CallObjectMethod(env, self->object, __repr__);
+            } else {
+                //method does not exist, clear exception
+                if ((*env)->ExceptionCheck(env)) {
+                    (*env)->ExceptionClear(env);
+                }
             }
+            Py_END_ALLOW_THREADS
+            if (process_java_exception(env)) {
+                return NULL;
+            }
+            if (jrepr != NULL) {
+                pyres = jstring_As_PyString(env, jrepr);
+            }
+            (*env)->DeleteLocalRef(env, jrepr);
         }
-        Py_END_ALLOW_THREADS
-        if (process_java_exception(env)) {
-            return NULL;
-        }
-        if (jrepr != NULL) {
-            pyres = jstring_As_PyString(env, jrepr);
-        }
-        (*env)->DeleteLocalRef(env, jrepr);
     }
 
     if (pyres == NULL) {

diff --git a/src/test/python/test_object.py b/src/test/python/test_object.py
@@ -17,7 +17,7 @@ def test_str(self):
     def test_repr(self):
         self.assertEquals(repr(TestPyJObject.ReprClass()), "ReprClass")
         self.assertEquals(repr(TestPyJObject.ReprSubClass()), "ReprSubClass")
-        self.assertIn("<jep.PyJObject object at", repr(Object()))
+        self.assertIn("<java.lang.Object object at", repr(Object()))
 
     def test_del_throws_exception(self):
         o = Object()