From: Benjamin A. Beasley <code@musicinmybrain.net>
Date: Sun, 16 Jun 2024 12:15:17 +0000 (-0400)
Subject: Work around _PyArg_NoKeywords moving to a private header in CPython 3.13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F11500%2Fhead;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Work around _PyArg_NoKeywords moving to a private header in CPython 3.13

See: https://github.com/python/cpython/issues/110964

Fixes: #11499
---

diff --git a/lib/sqlalchemy/cextension/resultproxy.c b/lib/sqlalchemy/cextension/resultproxy.c
index 8e8b6f9e4f..a88af0ede9 100644
--- a/lib/sqlalchemy/cextension/resultproxy.c
+++ b/lib/sqlalchemy/cextension/resultproxy.c
@@ -821,6 +821,29 @@ typedef struct {
 
 static PyTypeObject tuplegetter_type;
 
+static int
+PyArg_NoKeywords(const char *funcname, PyObject *kwargs)
+{
+#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 13
+    /* Based on the one in CPython, removed from the public headers in 3.13
+     * (https://github.com/python/cpython/issues/110964)
+     */
+    if (kwargs == NULL)
+        return 1;
+    if (!PyDict_CheckExact(kwargs)) {
+        PyErr_BadInternalCall();
+        return 0;
+    }
+    if (PyDict_GET_SIZE(kwargs) == 0)
+        return 1;
+
+    PyErr_Format(PyExc_TypeError, "%.200s() takes no keyword arguments", funcname);
+    return 0;
+#else
+    return _PyArg_NoKeywords(funcname, kwargs);
+#endif
+}
+
 static PyObject *
 tuplegetter_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
@@ -828,7 +851,7 @@ tuplegetter_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     PyObject *item;
     Py_ssize_t nitems;
 
-    if (!_PyArg_NoKeywords("tuplegetter", kwds))
+    if (!PyArg_NoKeywords("tuplegetter", kwds))
         return NULL;
 
     nitems = PyTuple_GET_SIZE(args);