From: Guido van Rossum <guido@python.org>
Date: Thu, 1 Nov 2001 14:23:28 +0000 (+0000)
Subject: SF bug #477059 (my own): __del__ on new classes vs. GC.
X-Git-Tag: v2.2.1c1~926
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8cc705eabcea0436ba51ff5eb87aafa82521d2b4;p=thirdparty%2FPython%2Fcpython.git

SF bug #477059 (my own): __del__ on new classes vs. GC.

When moving objects with a __del__ attribute to a special list, look
for __del__ on new-style classes with the HEAPTYPE flag set as well.
(HEAPTYPE means the class was created by a class statement.)
---

diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index 0badc23a4d34..a0522a095242 100644
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -241,7 +241,9 @@ move_finalizers(PyGC_Head *unreachable, PyGC_Head *finalizers)
 	for (; gc != unreachable; gc=next) {
 		PyObject *op = FROM_GC(gc);
 		next = gc->gc.gc_next;
-		if (PyInstance_Check(op) && PyObject_HasAttr(op, delstr)) {
+		if ((PyInstance_Check(op) ||
+		     PyType_HasFeature(op->ob_type, Py_TPFLAGS_HEAPTYPE)) &&
+		    PyObject_HasAttr(op, delstr)) {
 			gc_list_remove(gc);
 			gc_list_append(gc, finalizers);
 		}