SF bug #978308, Spurious errors taking bool of dead pro

nnorwitz · nnorwitz · commit bdcb9410c20c · 2004-07-08T01:22:31.000Z
Need to return -1 on error.

Needs backport.
diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py
@@ -104,6 +104,7 @@ def check(proxy):
 
         self.assertRaises(weakref.ReferenceError, check, ref1)
         self.assertRaises(weakref.ReferenceError, check, ref2)
+        self.assertRaises(weakref.ReferenceError, bool, weakref.proxy(C()))
         self.assert_(self.cbcalled == 2)
 
     def check_basic_ref(self, factory):
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
@@ -504,7 +504,7 @@ proxy_nonzero(PyWeakReference *proxy)
 {
     PyObject *o = PyWeakref_GET_OBJECT(proxy);
     if (!proxy_checkref(proxy))
-        return 1;
+        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);

Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,7 @@ proxy_nonzero(PyWeakReference *proxy)`
`504`	`504`	`{`
`505`	`505`	`PyObject *o = PyWeakref_GET_OBJECT(proxy);`
`506`	`506`	`if (!proxy_checkref(proxy))`
`507`		`- return 1;`
	`507`	`+ return -1;`
`508`	`508`	`if (o->ob_type->tp_as_number &&`
`509`	`509`	`o->ob_type->tp_as_number->nb_nonzero)`
`510`	`510`	`return (*o->ob_type->tp_as_number->nb_nonzero)(o);`