diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2017-01-17 01:40:01 +0100 |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2017-01-17 01:40:01 +0100 |
commit | 314561ad8463212043ac4a61f44a8ba9e5784390 (patch) | |
tree | c574e830a58c85e9b34eb96cb2b1195bf75fe777 /Python | |
parent | 78a0bd77f603b38267d6e8084cd09873f3beecc1 (diff) | |
download | cpython-314561ad8463212043ac4a61f44a8ba9e5784390.tar.gz |
Add _PyArg_NoStackKeywords() helper function
Issue #29286. Similar to _PyArg_NoKeywords(), but expects a tuple of keyword
names, instead of a dict.
Diffstat (limited to 'Python')
-rw-r--r-- | Python/getargs.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/Python/getargs.c b/Python/getargs.c index 35500d7e7d..e3611d8153 100644 --- a/Python/getargs.c +++ b/Python/getargs.c @@ -2429,16 +2429,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_GET_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); |