ada/cpython
0
0
Fork 0
mirror of https://github.com/AdaCore/cpython.git synced 2026-02-12 12:57:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

bpo-29684: Fix minor regression of PyEval_CallObjectWithKeywords. (GH-378)

Browse Source
This commit is contained in:
INADA Naoki
2017-03-01 21:14:43 +09:00
committed by GitHub
parent 1b93ed4f3e
commit 023532e558
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Python/ceval.c
View File

@@ -4699,11 +4699,7 @@ PyEval_CallObjectWithKeywords(PyObject *func, PyObject *args, PyObject *kwargs)
assert(!PyErr_Occurred());
#endif
if (args == NULL) {
return _PyObject_FastCallDict(func, NULL, 0, kwargs);
}
if (!PyTuple_Check(args)) {
if (args != NULL && !PyTuple_Check(args)) {
PyErr_SetString(PyExc_TypeError,
"argument list must be a tuple");
return NULL;
@@ -4715,7 +4711,12 @@ PyEval_CallObjectWithKeywords(PyObject *func, PyObject *args, PyObject *kwargs)
return NULL;
}
return PyObject_Call(func, args, kwargs);
if (args == NULL) {
return _PyObject_FastCallDict(func, NULL, 0, kwargs);
}
else {
return PyObject_Call(func, args, kwargs);
}
}
const char *