summaryrefslogtreecommitdiff
path: root/Python/ceval.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-08-22 23:26:00 +0200
committerVictor Stinner <victor.stinner@gmail.com>2016-08-22 23:26:00 +0200
commit947bc084fc2339a44e3f55169653edd8bd17c248 (patch)
tree31bcb011933d08ab8b6feb2ad55096312c0d88b9 /Python/ceval.c
parent5b00c5b38cada10df9f78640f356476cc6e6dc7f (diff)
downloadcpython-947bc084fc2339a44e3f55169653edd8bd17c248.tar.gz
PyEval_CallObjectWithKeywords() uses fast call with kwargs
Issue #27809. _PyObject_FastCallDict() now supports keyword arguments, and so the args==NULL fast-path can also be used when kwargs is not NULL.
Diffstat (limited to 'Python/ceval.c')
-rw-r--r--Python/ceval.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/Python/ceval.c b/Python/ceval.c
index 9c6593791f..fd456ceed1 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4590,30 +4590,22 @@ PyEval_CallObjectWithKeywords(PyObject *func, PyObject *args, PyObject *kwargs)
#endif
if (args == NULL) {
- if (kwargs == NULL) {
- return _PyObject_CallNoArg(func);
- }
-
- args = PyTuple_New(0);
- if (args == NULL)
- return NULL;
+ return _PyObject_FastCallDict(func, NULL, 0, kwargs);
}
- else if (!PyTuple_Check(args)) {
+
+ if (!PyTuple_Check(args)) {
PyErr_SetString(PyExc_TypeError,
"argument list must be a tuple");
return NULL;
}
- else {
- Py_INCREF(args);
- }
if (kwargs != NULL && !PyDict_Check(kwargs)) {
PyErr_SetString(PyExc_TypeError,
"keyword list must be a dictionary");
- Py_DECREF(args);
return NULL;
}
+ Py_INCREF(args);
result = PyObject_Call(func, args, kwargs);
Py_DECREF(args);