summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-05-09 19:03:05 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-05-09 19:03:05 (GMT)
commita7dc949e170237d6e59a0c0c5c784a00960756a7 (patch)
treeff3980e1ba1ea349cc3da16998ea5cfed67b3853
parent784d45506670ce86d857ee118f0f64a2b667d386 (diff)
downloadcpython-a7dc949e170237d6e59a0c0c5c784a00960756a7.zip
cpython-a7dc949e170237d6e59a0c0c5c784a00960756a7.tar.gz
cpython-a7dc949e170237d6e59a0c0c5c784a00960756a7.tar.bz2
ignore AttributeErrors for classic classes
-rw-r--r--Objects/abstract.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c
index 99b22db..e90710c 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -116,7 +116,8 @@ _PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue)
ro = PyObject_CallFunctionObjArgs(hintmeth, NULL);
Py_DECREF(hintmeth);
if (ro == NULL) {
- if (!PyErr_ExceptionMatches(PyExc_TypeError))
+ if (!PyErr_ExceptionMatches(PyExc_TypeError) &&
+ !PyErr_ExceptionMatches(PyExc_AttributeError))
return -1;
return defaultvalue;
}