From 4030714a93afacdcb4783f37320c48b4ad99da87 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 9 Aug 2002 17:39:14 +0000 Subject: For new-style classes, we can now test for tp_del instead of asking for a __del__ attribute, to see if there's a finalizer. --- Modules/gcmodule.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c index e0c7631..bae2653 100644 --- a/Modules/gcmodule.c +++ b/Modules/gcmodule.c @@ -346,9 +346,9 @@ has_finalizer(PyObject *op) if (delstr == NULL) Py_FatalError("PyGC: can't initialize __del__ string"); } - return (PyInstance_Check(op) || - PyType_HasFeature(op->ob_type, Py_TPFLAGS_HEAPTYPE)) - && PyObject_HasAttr(op, delstr); + return PyInstance_Check(op) ? PyObject_HasAttr(op, delstr) : + PyType_HasFeature(op->ob_type, Py_TPFLAGS_HEAPTYPE) ? + op->ob_type->tp_del != NULL : 0; } /* Move all objects with finalizers (instances with __del__) */ -- cgit v0.12