Merged revisions 72907 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72907 | benjamin.peterson | 2009-05-24 21:40:21 -0500 (Sun, 24 May 2009) | 1 line handle errors from _PyObject_LookupSpecial when __get__ fails ........

--- a/Objects/object.c	Mon May 25 00:51:58 2009 +0000
+++ b/Objects/object.c	Mon May 25 03:10:48 2009 +0000
@@ -497,6 +497,8 @@
             }
             return result;
 	}
+	else if (PyErr_Occurred())
+		return NULL;
 	return PyBytes_FromObject(v);
 }