diff options
author | Brett Cannon <brett@python.org> | 2012-04-27 15:31:45 -0400 |
---|---|---|
committer | Brett Cannon <brett@python.org> | 2012-04-27 15:31:45 -0400 |
commit | 6d3b3218be62b723d8aaea1676e8eb7d7b937649 (patch) | |
tree | f6c6a05ed346c34ce3c0e8854aa9f0f439e5367a | |
parent | aa93642a35ed570ba91a80c583df2c8a383686d6 (diff) | |
parent | 64acccf46d6aea1e7d975dcb23e3567cf0b49d5d (diff) | |
download | cpython-git-6d3b3218be62b723d8aaea1676e8eb7d7b937649.tar.gz |
merge
-rw-r--r-- | Objects/typeobject.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 58f55df166..9babd574a2 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -2593,6 +2593,9 @@ type_setattro(PyTypeObject *type, PyObject *name, PyObject *value) return update_slot(type, name); } +extern void +_PyDictKeys_DecRef(PyDictKeysObject *keys); + static void type_dealloc(PyTypeObject *type) { @@ -2616,6 +2619,8 @@ type_dealloc(PyTypeObject *type) Py_XDECREF(et->ht_name); Py_XDECREF(et->ht_qualname); Py_XDECREF(et->ht_slots); + if (et->ht_cached_keys) + _PyDictKeys_DecRef(et->ht_cached_keys); Py_TYPE(type)->tp_free((PyObject *)type); } @@ -2791,9 +2796,6 @@ type_traverse(PyTypeObject *type, visitproc visit, void *arg) return 0; } -extern void -_PyDictKeys_DecRef(PyDictKeysObject *keys); - static int type_clear(PyTypeObject *type) { |