Add test for member kind precedence

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/cpyext/__init__.py

@@ -49,6 +49,15 @@
 GRAALPYTHON = sys.implementation.name == "graalpy"
 
 
+def assert_raises(err, fn, *args, **kwargs):
+    raised = False
+    try:
+        fn(*args, **kwargs)
+    except err:
+        raised = True
+    assert raised
+
+
 def unhandled_error_compare(x, y):
     if (isinstance(x, BaseException) and isinstance(y, BaseException)):
         return type(x) == type(y)
@@ -552,6 +561,11 @@ def CPyExtType(name, code, **kwargs):
         {{NULL, NULL, 0, NULL}}
     }};
 
+    static struct PyGetSetDef {name}_getset[] = {{
+        """ + ("""{tp_getset},""" if "tp_getset" in kwargs else "") + """
+        {{NULL, NULL, NULL, NULL, NULL}}
+    }};
+
     static struct PyMemberDef {name}_members[] = {{
         """ + ("""{tp_members},""" if "tp_members" in kwargs else "") + """
         {{NULL, 0, 0, 0, NULL}}
@@ -587,7 +601,7 @@ def CPyExtType(name, code, **kwargs):
         {tp_iternext},              /* tp_iternext */
         {name}_methods,             /* tp_methods */
         {name}_members,             /* tp_members */
-        {tp_getset},                /* tp_getset */
+        {name}_getset,              /* tp_getset */
         {tp_base},                  /* tp_base */
         {tp_dict},                  /* tp_dict */
         {tp_descr_get},             /* tp_descr_get */

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_member.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -37,21 +37,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import sys
-from . import CPyExtType
+from . import CPyExtType, assert_raises
 
 __dir__ = __file__.rpartition("/")[0]
 
 
-def assert_raises(err, fn, *args, **kwargs):
-    raised = False
-    try:
-        fn(*args, **kwargs)
-    except err:
-        raised = True
-    assert raised
-
-
 def _reference_classmethod(args):
     if isinstance(args[0], type(list.append)):
         return classmethod(args[0])()
@@ -279,4 +269,4 @@ def test_member(self):
         assert_raises(TypeError, setattr, obj, "member_char", "xyz")
         assert obj.member_char == "x"
 
-        warnings.resetwarnings()
+        warnings.resetwarnings()

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_method.py

@@ -38,20 +38,11 @@
 # SOFTWARE.
 import types
 
-from . import CPyExtType, CPyExtTestCase, unhandled_error_compare, CPyExtFunction
+from . import CPyExtType, CPyExtTestCase, unhandled_error_compare, CPyExtFunction, assert_raises
 
 __dir__ = __file__.rpartition("/")[0]
 
 
-def assert_raises(err, fn, *args, **kwargs):
-    raised = False
-    try:
-        fn(*args, **kwargs)
-    except err:
-        raised = True
-    assert raised
-
-
 def _reference_classmethod(args):
     if isinstance(args[0], type(list.append)):
         return classmethod(args[0])()

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_object.py

@@ -39,7 +39,7 @@
 
 import sys
 
-from . import CPyExtType, CPyExtTestCase, CPyExtFunction, GRAALPYTHON, unhandled_error_compare
+from . import CPyExtType, CPyExtTestCase, CPyExtFunction, GRAALPYTHON, unhandled_error_compare, assert_raises
 
 __dir__ = __file__.rpartition("/")[0]
 
@@ -744,6 +744,84 @@ class X(_A, B):
         x = X()
         assert x.foo == "foo"
 
+    def test_getset(self):
+        TestGetter = CPyExtType(
+            "TestGetter",
+            """
+            static PyObject* foo_getter(PyObject* self, void* unused) {
+                return PyUnicode_FromString("getter");
+            }
+            """,
+            tp_getset='{"foo", foo_getter, (setter)NULL, NULL, NULL}',
+        )
+        obj = TestGetter()
+        assert obj.foo == 'getter'
+
+        def call_set():
+            obj.foo = 'set'
+
+        assert_raises(AttributeError, call_set)
+
+        TestSetter = CPyExtType(
+            "TestSetter",
+            """
+            static int state;
+
+            static PyObject* foo_getter(PyObject* self, void* unused) {
+                if (state == 0)
+                    return PyUnicode_FromString("unset");
+                else
+                    return PyUnicode_FromString("set");
+            }
+
+            static int foo_setter(PyObject* self, PyObject* val, void* unused) {
+                state = val != NULL;
+                return 0;
+            }
+            """,
+            tp_getset='{"foo", foo_getter, (setter)foo_setter, NULL, NULL}',
+        )
+        obj = TestSetter()
+        assert obj.foo == 'unset'
+        obj.foo = 'asdf'
+        assert obj.foo == 'set'
+        del obj.foo
+        assert obj.foo == 'unset'
+
+    def test_member_kind_precedence(self):
+        TestWithConflictingMember1 = CPyExtType(
+            "TestWithConflictingMember1",
+            """
+            static PyObject* foo_method(PyObject* self, PyObject* unused) {
+                return PyUnicode_FromString("method");
+            }
+
+            static PyObject* foo_getter(PyObject* self, void* unused) {
+                return PyUnicode_FromString("getter");
+            }
+            """,
+            cmembers="PyObject* foo_member;",
+            tp_members='{"foo", T_OBJECT, offsetof(TestWithConflictingMember1Object, foo_member), 0, NULL}',
+            tp_methods='{"foo", foo_method, METH_NOARGS, ""}',
+            tp_getset='{"foo", foo_getter, (setter)NULL, NULL, NULL}',
+        )
+        obj = TestWithConflictingMember1()
+        assert obj.foo() == 'method'
+
+        TestWithConflictingMember2 = CPyExtType(
+            "TestWithConflictingMember2",
+            """
+            static PyObject* foo_getter(PyObject* self, void* unused) {
+                return PyUnicode_FromString("getter");
+            }
+            """,
+            cmembers="PyObject* foo_member;",
+            tp_members='{"foo", T_OBJECT, offsetof(TestWithConflictingMember2Object, foo_member), 0, NULL}',
+            tp_getset='{"foo", foo_getter, (setter)NULL, NULL, NULL}',
+        )
+        obj = TestWithConflictingMember2()
+        assert obj.foo is None  # The member takes precedence
+
     def test_slot_precedence(self):
         MapAndSeq = CPyExtType("MapAndSeq",
                                '''