mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 16:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Add _PyArg_NoStackKeywords() helper function

Browse source 
Issue #29286. Similar to _PyArg_NoKeywords(), but expects a tuple of keyword
names, instead of a dict.
This commit is contained in:
Victor Stinner 2017-01-17 01:40:01 +01:00
parent 6518a93cb1
commit 29d39cc8f5
2 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Include/modsupport.h
View file

@ -48,7 +48,8 @@ PyAPI_FUNC(PyObject *) Py_BuildValue(const char *, ...);
PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...); PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...);
#endif #endif
#ifndef Py_LIMITED_API #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_NoPositional(const char *funcname, PyObject *args);
PyAPI_FUNC(int) PyArg_VaParse(PyObject *, const char *, va_list); PyAPI_FUNC(int) PyArg_VaParse(PyObject *, const char *, va_list);

25
Python/getargs.c
View file

@ -2429,16 +2429,33 @@ PyArg_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t m
* not empty, returns 1 otherwise * not empty, returns 1 otherwise
*/ */
int int
_PyArg_NoKeywords(const char *funcname, PyObject *kw) _PyArg_NoKeywords(const char *funcname, PyObject *kwargs)
{ {
if (kw == NULL) if (kwargs == NULL)
return 1; return 1;
if (!PyDict_CheckExact(kw)) { if (!PyDict_CheckExact(kwargs)) {
PyErr_BadInternalCall(); PyErr_BadInternalCall();
return 0; return 0;
} }
if (PyDict_GET_SIZE(kw) == 0) if (PyDict_GET_SIZE(kwargs) == 0) {
return 1; 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", PyErr_Format(PyExc_TypeError, "%s does not take keyword arguments",
funcname); funcname);