merge

brettcannon · brettcannon · commit 6d3b3218be62 · 2012-04-27T15:31:45.000-04:00
diff --git 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)
 {

Original file line number	Diff line number	Diff line change
`@@ -2593,6 +2593,9 @@ type_setattro(PyTypeObject type, PyObject name, PyObject *value)`
`2593`	`2593`	`return update_slot(type, name);`
`2594`	`2594`	`}`
`2595`	`2595`
	`2596`	`+extern void`
	`2597`	`+_PyDictKeys_DecRef(PyDictKeysObject *keys);`
	`2598`	`+`
`2596`	`2599`	`static void`
`2597`	`2600`	`type_dealloc(PyTypeObject *type)`
`2598`	`2601`	`{`
`@@ -2616,6 +2619,8 @@ type_dealloc(PyTypeObject *type)`
`2616`	`2619`	`Py_XDECREF(et->ht_name);`
`2617`	`2620`	`Py_XDECREF(et->ht_qualname);`
`2618`	`2621`	`Py_XDECREF(et->ht_slots);`
	`2622`	`+ if (et->ht_cached_keys)`
	`2623`	`+ _PyDictKeys_DecRef(et->ht_cached_keys);`
`2619`	`2624`	`Py_TYPE(type)->tp_free((PyObject *)type);`
`2620`	`2625`	`}`
`2621`	`2626`
`@@ -2791,9 +2796,6 @@ type_traverse(PyTypeObject type, visitproc visit, void arg)`
`2791`	`2796`	`return 0;`
`2792`	`2797`	`}`
`2793`	`2798`
`2794`		`-extern void`
`2795`		`-_PyDictKeys_DecRef(PyDictKeysObject *keys);`
`2796`		`-`
`2797`	`2799`	`static int`
`2798`	`2800`	`type_clear(PyTypeObject *type)`
`2799`	`2801`	`{`