Fix: Correctly return dict for 'PyEval_GetBuiltins'.

Author: fangerer

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

@@ -151,15 +151,14 @@ def file_not_empty(path):
         return NULL;
     }}
 
-    if (strlen("{argspec}") > 0) {{
-        if (!PyArg_ParseTuple(___arg, "{argspec}", {derefargumentnames})) {{
-            return NULL;
-        }}
-    }}
 #ifdef SINGLEARG
-    else {{
-        {singleargumentname} = ___arg;
+    {singleargumentname} = ___arg;
+#else 
+#ifndef NOARGS
+    if (!PyArg_ParseTuple(___arg, "{argspec}", {derefargumentnames})) {{
+        return NULL;
     }}
+#endif
 #endif
 
     return Py_BuildValue("{resultspec}", {callfunction}({argumentnames}));
@@ -326,10 +325,12 @@ def create_module(self, name=None):
 
         self._insert(fargs, "argumentdeclarations", ";".join(fargs["parseargs"]))
         self._insert(fargs, "argumentnames", ", ".join(arg.rpartition(" ")[2] for arg in fargs["arguments"]))
-        self._insert(fargs, "singleargumentname", fargs["arguments"][0].rpartition(" ")[2])
+        self._insert(fargs, "singleargumentname", fargs["arguments"][0].rpartition(" ")[2] if fargs["arguments"] else "")
         self._insert(fargs, "derefargumentnames", ", ".join("&" + arg.rpartition(" ")[2].partition("=")[0] for arg in fargs["arguments"]))
         self._insert(fargs, "callfunction", fargs["capifunction"])
-        if len(fargs["argspec"]) == 0:
+        if len(fargs["argspec"]) == 0 and len(fargs["arguments"]) == 0:
+            fargs["defines"] = "#define NOARGS"
+        elif len(fargs["argspec"]) == 0:
             fargs["defines"] = "#define SINGLEARG"
         else:
             fargs["defines"] = ""

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

@@ -39,8 +39,11 @@
 
 import sys
 from . import CPyExtTestCase, CPyExtFunction, CPyExtFunctionOutVars, unhandled_error_compare, GRAALPYTHON
+import builtins
 __dir__ = __file__.rpartition("/")[0]
 
+__global_builtins_dict = builtins.__dict__
+
 
 def _reference_importmodule(args):
     return __import__(args[0], fromlist=["*"])
@@ -53,6 +56,10 @@ def _reference_format_float(args):
     return float(val).__format__("." + str(prec) + format_spec.decode())
 
 
+def _reference_builtins(args):
+    return type(__global_builtins_dict)
+
+
 class TestMisc(CPyExtTestCase):
 
     def compile_module(self, name):
@@ -241,3 +248,20 @@ def compile_module(self, name):
         callfunction="wrap_PyOS_double_to_string",
         cmpfunc=unhandled_error_compare
     )
+
+    test_PyEval_GetBuiltins = CPyExtFunction(
+        _reference_builtins,
+        lambda: (
+            tuple(),
+        ),
+        code="""
+        PyObject* wrap_PyEval_GetBuiltins() {
+            return Py_TYPE(PyEval_GetBuiltins());
+        }
+        """,
+        resultspec="O",
+        argspec="",
+        arguments=[],
+        callfunction="wrap_PyEval_GetBuiltins",
+        cmpfunc=unhandled_error_compare
+    )

graalpython/lib-graalpython/python_cext.py

@@ -44,6 +44,7 @@
 capi = capi_to_java = None
 _capi_hooks = []
 
+__builtins_module_dict = None
 
 def register_capi_hook(hook):
     assert callable(hook)
@@ -1555,4 +1556,8 @@ def PyState_FindModule(module_name):
 
 @may_raise
 def PyEval_GetBuiltins():
-    return __builtins__.__dir__
+    global __builtins_module_dict
+    if not __builtins_module_dict:
+        import builtins
+        __builtins_module_dict = builtins.__dict__
+    return __builtins_module_dict