diff options
| author | Ned Deily <nad@python.org> | 2016-09-12 20:57:18 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@python.org> | 2016-09-12 20:57:18 (GMT) |
| commit | 3c70a992be9db7c69a055e523053426d3c655b39 (patch) | |
| tree | 93ecf7c3a9f6fac38abd0ce00352496212c8040a /Objects | |
| parent | 4a94bbe5179c3966ddb1ae2876e582314e4ddbba (diff) | |
| parent | 41fca9d166f42762407b534354d864a1aac8d95a (diff) | |
| download | cpython-3c70a992be9db7c69a055e523053426d3c655b39.zip cpython-3c70a992be9db7c69a055e523053426d3c655b39.tar.gz cpython-3c70a992be9db7c69a055e523053426d3c655b39.tar.bz2 | |
Post 3.6.0b1 merge
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/methodobject.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Objects/methodobject.c b/Objects/methodobject.c index 19e8114..c2001f0 100644 --- a/Objects/methodobject.c +++ b/Objects/methodobject.c @@ -273,7 +273,7 @@ _PyCFunction_FastCallKeywords(PyObject *func, PyObject **stack, Py_ssize_t nargs, PyObject *kwnames) { PyObject *kwdict, *result; - Py_ssize_t nkwargs; + Py_ssize_t nkwargs = (kwnames == NULL) ? 0 : PyTuple_GET_SIZE(kwnames); assert(PyCFunction_Check(func)); assert(nargs >= 0); @@ -282,7 +282,6 @@ _PyCFunction_FastCallKeywords(PyObject *func, PyObject **stack, /* kwnames must only contains str strings, no subclass, and all keys must be unique */ - nkwargs = (kwnames == NULL) ? 0 : PyTuple_GET_SIZE(kwnames); if (nkwargs > 0) { kwdict = _PyStack_AsDict(stack + nargs, kwnames); if (kwdict == NULL) { |