From 94c65d9a8ff8ec56c2420f46a6622803f7f1b154 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 25 May 2009 03:10:48 +0000 Subject: 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 ........ --- Objects/enumobject.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Objects/enumobject.c') diff --git a/Objects/enumobject.c b/Objects/enumobject.c index f8e407282e..62e55bb88a 100644 --- a/Objects/enumobject.c +++ b/Objects/enumobject.c @@ -238,6 +238,8 @@ reversed_new(PyTypeObject *type, PyObject *args, PyObject *kwds) Py_DECREF(reversed_meth); return res; } + else if (PyErr_Occurred()) + return NULL; if (!PySequence_Check(seq)) { PyErr_SetString(PyExc_TypeError, -- cgit v1.2.1