[Python-checkins] cpython (merge default -> default): merge

[brett.cannon]

http://hg.python.org/cpython/rev/cbaaf95476e7
changeset:   76583:cbaaf95476e7
parent:      76582:7025ee00dbf6
parent:      76581:a3beae842f13
user:        Brett Cannon <brett at python.org>
date:        Fri Apr 27 15:31:45 2012 -0400
summary:
  merge

files:
  Objects/typeobject.c |  8 +++++---
  1 files changed, 5 insertions(+), 3 deletions(-)


diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2593,6 +2593,9 @@
     return update_slot(type, name);
 }
 
+extern void
+_PyDictKeys_DecRef(PyDictKeysObject *keys);
+
 static void
 type_dealloc(PyTypeObject *type)
 {
@@ -2616,6 +2619,8 @@
     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 @@
     return 0;
 }
 
-extern void
-_PyDictKeys_DecRef(PyDictKeysObject *keys);
-
 static int
 type_clear(PyTypeObject *type)
 {

-- 
Repository URL: http://hg.python.org/cpython