Mercurial > cpython-lru_cache-weakref

diff Objects/enumobject.c @ 54326:db212869d814

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 ........
author Benjamin Peterson <benjamin@python.org>
date Mon, 25 May 2009 03:10:48 +0000
parents afd62eb1692e
children a07568c7a82a
line wrap: on
line diff
--- a/Objects/enumobject.c	Mon May 25 00:51:58 2009 +0000
+++ b/Objects/enumobject.c	Mon May 25 03:10:48 2009 +0000
@@ -238,6 +238,8 @@
 		Py_DECREF(reversed_meth);
 		return res;
 	}
+	else if (PyErr_Occurred())
+		return NULL;
 
 	if (!PySequence_Check(seq)) {
 		PyErr_SetString(PyExc_TypeError,