Index: Objects/abstract.c
===================================================================
--- Objects/abstract.c	(revision 67226)
+++ Objects/abstract.c	(working copy)
@@ -2575,13 +2575,11 @@
 		return null_error();
 
 	func = PyObject_GetAttrString(o, name);
-	if (func == NULL) {
-		PyErr_SetString(PyExc_AttributeError, name);
-		return 0;
-	}
+	if (func == NULL)
+		return NULL;
 
 	if (!PyCallable_Check(func)) {
-		type_error("attribute of type '%.200s' is not callable", func); 
+		type_error("attribute of type '%.200s' is not callable", func);
 		goto exit;
 	}
 
@@ -2614,13 +2612,11 @@
 		return null_error();
 
 	func = PyObject_GetAttrString(o, name);
-	if (func == NULL) {
-		PyErr_SetString(PyExc_AttributeError, name);
-		return 0;
-	}
+	if (func == NULL)
+		return NULL;
 
 	if (!PyCallable_Check(func)) {
-		type_error("attribute of type '%.200s' is not callable", func); 
+		type_error("attribute of type '%.200s' is not callable", func);
 		goto exit;
 	}