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

bpo-46085: Fix iterator cache mechanism of OrderedDict. (GH-30290)

This commit is contained in:
Dong-hee Na 2021-12-30 12:35:45 +09:00 committed by GitHub
parent d12bec6993
commit fb44d05896
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Core and Builtins/2021-12-30-00-23-41.bpo-46085.bDuJqu.rst Normal file
View File

@ -0,0 +1 @@
Fix iterator cache mechanism of :class:`OrderedDict`.

8
Objects/odictobject.c
View File

@ -1249,6 +1249,7 @@ PyDoc_STRVAR(odict_reversed__doc__, "od.__reversed__() <==> reversed(od)");
#define _odict_ITER_REVERSED 1 #define _odict_ITER_REVERSED 1
#define _odict_ITER_KEYS 2 #define _odict_ITER_KEYS 2
#define _odict_ITER_VALUES 4 #define _odict_ITER_VALUES 4
#define _odict_ITER_ITEMS (_odict_ITER_KEYS|_odict_ITER_VALUES)
/* forward */ /* forward */
static PyObject * odictiter_new(PyODictObject *, int); static PyObject * odictiter_new(PyODictObject *, int);
@ -1666,7 +1667,7 @@ odictiter_dealloc(odictiterobject *di)
_PyObject_GC_UNTRACK(di); _PyObject_GC_UNTRACK(di);
Py_XDECREF(di->di_odict); Py_XDECREF(di->di_odict);
Py_XDECREF(di->di_current); Py_XDECREF(di->di_current);
if (di->kind & (_odict_ITER_KEYS | _odict_ITER_VALUES)) { if ((di->kind & _odict_ITER_ITEMS) == _odict_ITER_ITEMS) {
Py_DECREF(di->di_result); Py_DECREF(di->di_result);
} }
PyObject_GC_Del(di); PyObject_GC_Del(di);
@ -1872,15 +1873,16 @@ odictiter_new(PyODictObject *od, int kind)
if (di == NULL) if (di == NULL)
return NULL; return NULL;
if (kind & (_odict_ITER_KEYS | _odict_ITER_VALUES)){ if ((kind & _odict_ITER_ITEMS) == _odict_ITER_ITEMS) {
di->di_result = PyTuple_Pack(2, Py_None, Py_None); di->di_result = PyTuple_Pack(2, Py_None, Py_None);
if (di->di_result == NULL) { if (di->di_result == NULL) {
Py_DECREF(di); Py_DECREF(di);
return NULL; return NULL;
} }
} }
else else {
di->di_result = NULL; di->di_result = NULL;
}
di->kind = kind; di->kind = kind;
node = reversed ? _odict_LAST(od) : _odict_FIRST(od); node = reversed ? _odict_LAST(od) : _odict_FIRST(od);