(original) (raw)

changeset: 106176:8bfec37ea86a user: Victor Stinner victor.stinner@gmail.com date: Tue Jan 17 01:40:01 2017 +0100 files: Include/modsupport.h Python/getargs.c description: Add _PyArg_NoStackKeywords() helper function Issue #29286. Similar to _PyArg_NoKeywords(), but expects a tuple of keyword names, instead of a dict. diff -r 01c57ef1b651 -r 8bfec37ea86a Include/modsupport.h --- a/Include/modsupport.h Tue Jan 17 01:29:49 2017 +0100 +++ b/Include/modsupport.h Tue Jan 17 01:40:01 2017 +0100 @@ -48,7 +48,8 @@ PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...); #endif #ifndef Py_LIMITED_API -PyAPI_FUNC(int) _PyArg_NoKeywords(const char *funcname, PyObject *kw); +PyAPI_FUNC(int) _PyArg_NoKeywords(const char *funcname, PyObject *kwargs); +PyAPI_FUNC(int) _PyArg_NoStackKeywords(const char *funcname, PyObject *kwnames); PyAPI_FUNC(int) _PyArg_NoPositional(const char *funcname, PyObject *args); PyAPI_FUNC(int) PyArg_VaParse(PyObject *, const char *, va_list); diff -r 01c57ef1b651 -r 8bfec37ea86a Python/getargs.c --- a/Python/getargs.c Tue Jan 17 01:29:49 2017 +0100 +++ b/Python/getargs.c Tue Jan 17 01:40:01 2017 +0100 @@ -2429,16 +2429,33 @@ * 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); /victor.stinner@gmail.com