[Python-checkins] r72516 - python/trunk/Objects/abstract.c

Sat May 9 21:03:05 CEST 2009

Author: benjamin.peterson
Date: Sat May 9 21:03:05 2009
New Revision: 72516
Log:
ignore AttributeErrors for classic classes
Modified:
 python/trunk/Objects/abstract.c
Modified: python/trunk/Objects/abstract.c
==============================================================================

--- python/trunk/Objects/abstract.c	(original)
+++ python/trunk/Objects/abstract.c	Sat May 9 21:03:05 2009
@@ -116,7 +116,8 @@
 	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;
 	}
