Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #29460: _PyArg_NoKeywords(), _PyArg_NoStackKeywords() and 

_PyArg_NoPositional() now are macros.
This commit is contained in:
Serhiy Storchaka 2017-02-06 10:41:46 +02:00
parent 6aee6fbce8
commit 68a001dd59
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Include/modsupport.h
View File

@ -62,6 +62,13 @@ PyAPI_FUNC(int) _PyArg_UnpackStack(
PyAPI_FUNC(int) _PyArg_NoKeywords(const char *funcname, PyObject *kwargs); PyAPI_FUNC(int) _PyArg_NoKeywords(const char *funcname, PyObject *kwargs);
PyAPI_FUNC(int) _PyArg_NoStackKeywords(const char *funcname, PyObject *kwnames); 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);
#define _PyArg_NoKeywords(funcname, kwargs) \
((kwargs) == NULL || _PyArg_NoKeywords((funcname), (kwargs)))
#define _PyArg_NoStackKeywords(funcname, kwnames) \
((kwnames) == NULL || _PyArg_NoStackKeywords((funcname), (kwnames)))
#define _PyArg_NoPositional(funcname, args) \
((args) == NULL || _PyArg_NoPositional((funcname), (args)))
#endif #endif
PyAPI_FUNC(PyObject *) Py_VaBuildValue(const char *, va_list); PyAPI_FUNC(PyObject *) Py_VaBuildValue(const char *, va_list);

6
Modules/_operator.c
View File

@ -993,7 +993,7 @@ itemgetter_call(itemgetterobject *ig, PyObject *args, PyObject *kw)
PyObject *obj, *result; PyObject *obj, *result;
Py_ssize_t i, nitems=ig->nitems; Py_ssize_t i, nitems=ig->nitems;
if (kw != NULL && !_PyArg_NoKeywords("itemgetter", kw)) if (!_PyArg_NoKeywords("itemgetter", kw))
return NULL; return NULL;
if (!PyArg_UnpackTuple(args, "itemgetter", 1, 1, &obj)) if (!PyArg_UnpackTuple(args, "itemgetter", 1, 1, &obj))
return NULL; return NULL;
@ -1283,7 +1283,7 @@ attrgetter_call(attrgetterobject *ag, PyObject *args, PyObject *kw)
PyObject *obj, *result; PyObject *obj, *result;
Py_ssize_t i, nattrs=ag->nattrs; Py_ssize_t i, nattrs=ag->nattrs;
if (kw != NULL && !_PyArg_NoKeywords("attrgetter", kw)) if (!_PyArg_NoKeywords("attrgetter", kw))
return NULL; return NULL;
if (!PyArg_UnpackTuple(args, "attrgetter", 1, 1, &obj)) if (!PyArg_UnpackTuple(args, "attrgetter", 1, 1, &obj))
return NULL; return NULL;
@ -1527,7 +1527,7 @@ methodcaller_call(methodcallerobject *mc, PyObject *args, PyObject *kw)
{ {
PyObject *method, *obj, *result; PyObject *method, *obj, *result;
if (kw != NULL && !_PyArg_NoKeywords("methodcaller", kw)) if (!_PyArg_NoKeywords("methodcaller", kw))
return NULL; return NULL;
if (!PyArg_UnpackTuple(args, "methodcaller", 1, 1, &obj)) if (!PyArg_UnpackTuple(args, "methodcaller", 1, 1, &obj))
return NULL; return NULL;

5
Objects/setobject.c
View File

@ -1084,8 +1084,7 @@ frozenset_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{ {
PyObject *iterable = NULL, *result; PyObject *iterable = NULL, *result;
if (kwds != NULL && type == &PyFrozenSet_Type if (type == &PyFrozenSet_Type && !_PyArg_NoKeywords("frozenset()", kwds))
&& !_PyArg_NoKeywords("frozenset()", kwds))
return NULL; return NULL;
if (!PyArg_UnpackTuple(args, type->tp_name, 0, 1, &iterable)) if (!PyArg_UnpackTuple(args, type->tp_name, 0, 1, &iterable))
@ -2002,7 +2001,7 @@ set_init(PySetObject *self, PyObject *args, PyObject *kwds)
{ {
PyObject *iterable = NULL; PyObject *iterable = NULL;
if (kwds != NULL && !_PyArg_NoKeywords("set()", kwds)) if (!_PyArg_NoKeywords("set()", kwds))
return -1; return -1;
if (!PyArg_UnpackTuple(args, Py_TYPE(self)->tp_name, 0, 1, &iterable)) if (!PyArg_UnpackTuple(args, Py_TYPE(self)->tp_name, 0, 1, &iterable))
return -1; return -1;

4
Python/getargs.c
View File

@ -2446,6 +2446,10 @@ _PyArg_UnpackStack(PyObject **args, Py_ssize_t nargs, const char *name,
} }
#undef _PyArg_NoKeywords
#undef _PyArg_NoStackKeywords
#undef _PyArg_NoPositional
/* For type constructors that don't take keyword args /* For type constructors that don't take keyword args
* *
* Sets a TypeError and returns 0 if the args/kwargs is * Sets a TypeError and returns 0 if the args/kwargs is