commit e6c470f255b958d65db75e2b9c2416585638b6cf
author Raymond Hettinger <python@rcn.com> Sun Mar 27 03:04:54 2005 +0000
committer Raymond Hettinger <python@rcn.com> Sun Mar 27 03:04:54 2005 +0000
tree 0b5737e46e6a0b5451666b4b1505f78fed9cbec4
parent ca5d8fea3d1db3ecb914d6c266318e394ee1cb6b

SF bug #1770766:  weakref proxy has incorrect __nonzero__ behavior.

Objects/weakrefobject.c

diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
index 02370c4..5412dd3 100644
--- a/Objects/weakrefobject.c
+++ b/Objects/weakrefobject.c
@@ -505,11 +505,7 @@
     PyObject *o = PyWeakref_GET_OBJECT(proxy);
     if (!proxy_checkref(proxy))
         return -1;
-    if (o->ob_type->tp_as_number &&
-        o->ob_type->tp_as_number->nb_nonzero)
-        return (*o->ob_type->tp_as_number->nb_nonzero)(o);
-    else
-        return 1;
+    return PyObject_IsTrue(o);
 }
 
 static void