Author: benjamin.peterson
Date: Sat May 9 21:30:46 2009
New Revision: 72521
Log:
only need to catch an TypeError here
Modified:
python/branches/py3k/Objects/abstract.c
Modified: python/branches/py3k/Objects/abstract.c
==============================================================================
--- python/branches/py3k/Objects/abstract.c (original)
+++ python/branches/py3k/Objects/abstract.c Sat May 9 21:30:46 2009
@@ -83,9 +83,8 @@
if (rv >= 0)
return rv;
if (PyErr_Occurred()) {
- if (!PyErr_ExceptionMatches(PyExc_TypeError) &&
- !PyErr_ExceptionMatches(PyExc_AttributeError))
- return -1;
+ if (!PyErr_ExceptionMatches(PyExc_TypeError))
+ return -1;
PyErr_Clear();
}