diff options
| author | Raymond Hettinger <rhettinger@users.noreply.github.com> | 2019-04-20 17:20:44 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-20 17:20:44 (GMT) |
| commit | 14adbd45980f705cb6554ca17b8a66b56e105296 (patch) | |
| tree | 07074a6677cbf71830c1cfd3c3ebdf6652c8685b /Modules/_functoolsmodule.c | |
| parent | 9d062d690b768252204992fc6ab7c3873a87442d (diff) | |
| download | cpython-14adbd45980f705cb6554ca17b8a66b56e105296.zip cpython-14adbd45980f705cb6554ca17b8a66b56e105296.tar.gz cpython-14adbd45980f705cb6554ca17b8a66b56e105296.tar.bz2 | |
bpo-36650: Fix handling of empty keyword args in C version of lru_cache. (GH-12881)
Diffstat (limited to 'Modules/_functoolsmodule.c')
| -rw-r--r-- | Modules/_functoolsmodule.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c index 3f1c016..dcc9129 100644 --- a/Modules/_functoolsmodule.c +++ b/Modules/_functoolsmodule.c @@ -750,8 +750,10 @@ lru_cache_make_key(PyObject *args, PyObject *kwds, int typed) PyObject *key, *keyword, *value; Py_ssize_t key_size, pos, key_pos, kwds_size; + kwds_size = kwds ? PyDict_GET_SIZE(kwds) : 0; + /* short path, key will match args anyway, which is a tuple */ - if (!typed && !kwds) { + if (!typed && !kwds_size) { if (PyTuple_GET_SIZE(args) == 1) { key = PyTuple_GET_ITEM(args, 0); if (PyUnicode_CheckExact(key) || PyLong_CheckExact(key)) { @@ -765,9 +767,6 @@ lru_cache_make_key(PyObject *args, PyObject *kwds, int typed) return args; } - kwds_size = kwds ? PyDict_GET_SIZE(kwds) : 0; - assert(kwds_size >= 0); - key_size = PyTuple_GET_SIZE(args); if (kwds_size) key_size += kwds_size * 2 + 1; |