diff options
| -rw-r--r-- | Include/modsupport.h | 3 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/C API/2020-03-14-01-56-03.bpo-37207.R3jaTy.rst | 1 | ||||
| -rw-r--r-- | Objects/rangeobject.c | 3 | ||||
| -rw-r--r-- | Objects/tupleobject.c | 3 | ||||
| -rw-r--r-- | Python/getargs.c | 19 |
5 files changed, 24 insertions, 5 deletions
diff --git a/Include/modsupport.h b/Include/modsupport.h index f90ede4..f2dc812 100644 --- a/Include/modsupport.h +++ b/Include/modsupport.h @@ -60,9 +60,12 @@ PyAPI_FUNC(int) _PyArg_UnpackStack( ...); PyAPI_FUNC(int) _PyArg_NoKeywords(const char *funcname, PyObject *kwargs); +PyAPI_FUNC(int) _PyArg_NoKwnames(const char *funcname, PyObject *kwnames); PyAPI_FUNC(int) _PyArg_NoPositional(const char *funcname, PyObject *args); #define _PyArg_NoKeywords(funcname, kwargs) \ ((kwargs) == NULL || _PyArg_NoKeywords((funcname), (kwargs))) +#define _PyArg_NoKwnames(funcname, kwnames) \ + ((kwnames) == NULL || _PyArg_NoKwnames((funcname), (kwnames))) #define _PyArg_NoPositional(funcname, args) \ ((args) == NULL || _PyArg_NoPositional((funcname), (args))) diff --git a/Misc/NEWS.d/next/C API/2020-03-14-01-56-03.bpo-37207.R3jaTy.rst b/Misc/NEWS.d/next/C API/2020-03-14-01-56-03.bpo-37207.R3jaTy.rst new file mode 100644 index 0000000..216a821 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2020-03-14-01-56-03.bpo-37207.R3jaTy.rst @@ -0,0 +1 @@ +Add _PyArg_NoKwnames helper function. Patch by Dong-hee Na. diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c index 123ca0b..5bd178b 100644 --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -146,8 +146,7 @@ range_vectorcall(PyTypeObject *type, PyObject *const *args, size_t nargsf, PyObject *kwnames) { Py_ssize_t nargs = PyVectorcall_NARGS(nargsf); - if (kwnames && PyTuple_GET_SIZE(kwnames) != 0) { - PyErr_Format(PyExc_TypeError, "range() takes no keyword arguments"); + if (!_PyArg_NoKwnames("range", kwnames)) { return NULL; } return range_from_array(type, args, nargs); diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c index d4165de..8a8c6ae 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -709,8 +709,7 @@ static PyObject * tuple_vectorcall(PyObject *type, PyObject * const*args, size_t nargsf, PyObject *kwnames) { - if (kwnames && PyTuple_GET_SIZE(kwnames) != 0) { - PyErr_Format(PyExc_TypeError, "tuple() takes no keyword arguments"); + if (!_PyArg_NoKwnames("tuple", kwnames)) { return NULL; } diff --git a/Python/getargs.c b/Python/getargs.c index d644aea..062f814 100644 --- a/Python/getargs.c +++ b/Python/getargs.c @@ -2787,6 +2787,7 @@ _PyArg_UnpackStack(PyObject *const *args, Py_ssize_t nargs, const char *name, #undef _PyArg_NoKeywords +#undef _PyArg_NoKwnames #undef _PyArg_NoPositional /* For type constructors that don't take keyword args @@ -2813,7 +2814,6 @@ _PyArg_NoKeywords(const char *funcname, PyObject *kwargs) return 0; } - int _PyArg_NoPositional(const char *funcname, PyObject *args) { @@ -2831,6 +2831,23 @@ _PyArg_NoPositional(const char *funcname, PyObject *args) return 0; } +int +_PyArg_NoKwnames(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() takes no keyword arguments", funcname); + return 0; +} + void _PyArg_Fini(void) { |