mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 07:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Correctly forward exception in instance_contains().

Browse source 
Fixes #1591996. Patch contributed by Neal Norwitz.
Will backport.
This commit is contained in:
Martin v. Löwis 2006-11-08 06:46:37 +00:00
parent e452f51bc4
commit 3a62404264
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/test/test_class.py
View file

@ -172,6 +172,14 @@ testme ^ 1
# List/dict operations
class Empty: pass
try:
1 in Empty()
print 'failed, should have raised TypeError'
except TypeError:
pass
1 in testme
testme[1]

10
Objects/classobject.c
View file

@ -1318,15 +1318,17 @@ instance_contains(PyInstanceObject *inst, PyObject *member)
/* Couldn't find __contains__. */
if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
Py_ssize_t rc;
/* Assume the failure was simply due to that there is no
* __contains__ attribute, and try iterating instead.
*/
PyErr_Clear();
return _PySequence_IterSearch((PyObject *)inst, member,
PY_ITERSEARCH_CONTAINS) > 0;
rc = _PySequence_IterSearch((PyObject *)inst, member,
PY_ITERSEARCH_CONTAINS);
if (rc >= 0)
return rc > 0;
}
else
return -1;
return -1;
}
static PySequenceMethods