From bd127a01eec2b53af787a3c9e032bd0594c5e531 Mon Sep 17 00:00:00 2001 From: ahgamut <41098605+ahgamut@users.noreply.github.com> Date: Thu, 4 Nov 2021 23:29:46 +0530 Subject: [PATCH] Add _PyArg_NoStackKeywords refer python/cpython@29d39cc8f50 --- third_party/python/Include/modsupport.h | 3 ++- third_party/python/Python/getargs.c | 25 +++++++++++++++++++++---- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/third_party/python/Include/modsupport.h b/third_party/python/Include/modsupport.h index 94db636bb..eda039bef 100644 --- a/third_party/python/Include/modsupport.h +++ b/third_party/python/Include/modsupport.h @@ -47,7 +47,8 @@ PyObject * Py_BuildValue(const char *, ...); PyObject * _Py_BuildValue_SizeT(const char *, ...); #ifndef Py_LIMITED_API -int _PyArg_NoKeywords(const char *funcname, PyObject *kw); +int _PyArg_NoKeywords(const char *funcname, PyObject *kwargs); +int _PyArg_NoStackKeywords(const char *funcname, PyObject *kwnames); int _PyArg_NoPositional(const char *funcname, PyObject *args); #endif PyObject * Py_VaBuildValue(const char *, va_list); diff --git a/third_party/python/Python/getargs.c b/third_party/python/Python/getargs.c index 0a8e81157..e0983c2bb 100644 --- a/third_party/python/Python/getargs.c +++ b/third_party/python/Python/getargs.c @@ -2367,16 +2367,33 @@ PyArg_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t m * not empty, returns 1 otherwise */ int -_PyArg_NoKeywords(const char *funcname, PyObject *kw) +_PyArg_NoKeywords(const char *funcname, PyObject *kwargs) { - if (kw == NULL) + if (kwargs == NULL) return 1; - if (!PyDict_CheckExact(kw)) { + if (!PyDict_CheckExact(kwargs)) { PyErr_BadInternalCall(); return 0; } - if (PyDict_Size(kw) == 0) + if (PyDict_GET_SIZE(kwargs) == 0) { return 1; + } + + PyErr_Format(PyExc_TypeError, "%s does not take keyword arguments", + funcname); + return 0; +} + +int +_PyArg_NoStackKeywords(const char *funcname, PyObject *kwnames) +{ + if (kwnames == NULL) + return 1; + assert(PyTuple_CheckExact(kwnames)); + if (PyTuple_GET_SIZE(kwnames) == 0) { + return 1; + } + PyErr_Format(PyExc_TypeError, "%s does not take keyword arguments", funcname); return 0;