mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-18 22:50:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

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

Browse source 
Need to return -1 on error.

Needs backport.
This commit is contained in:
Neal Norwitz 2004-07-08 01:22:31 +00:00
parent bd7f76dd04
commit bdcb9410c2
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Lib/test/test_weakref.py
View file

@ -104,6 +104,7 @@ class ReferencesTestCase(TestBase):
self.assertRaises(weakref.ReferenceError, check, ref1) self.assertRaises(weakref.ReferenceError, check, ref1)
self.assertRaises(weakref.ReferenceError, check, ref2) self.assertRaises(weakref.ReferenceError, check, ref2)
self.assertRaises(weakref.ReferenceError, bool, weakref.proxy(C()))
self.assert_(self.cbcalled == 2) self.assert_(self.cbcalled == 2)
def check_basic_ref(self, factory): def check_basic_ref(self, factory):

2
Objects/weakrefobject.c
View file

@ -504,7 +504,7 @@ proxy_nonzero(PyWeakReference *proxy)
{ {
PyObject *o = PyWeakref_GET_OBJECT(proxy); PyObject *o = PyWeakref_GET_OBJECT(proxy);
if (!proxy_checkref(proxy)) if (!proxy_checkref(proxy))
return 1; return -1;
if (o->ob_type->tp_as_number && if (o->ob_type->tp_as_number &&
o->ob_type->tp_as_number->nb_nonzero) o->ob_type->tp_as_number->nb_nonzero)
return (*o->ob_type->tp_as_number->nb_nonzero)(o); return (*o->ob_type->tp_as_number->nb_nonzero)(o);