diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-05-25 03:10:48 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-05-25 03:10:48 (GMT) |
| commit | 94c65d9a8ff8ec56c2420f46a6622803f7f1b154 (patch) | |
| tree | 2b89b8c34e06c7a7c8b5b2076f551af956a0477e /Objects/enumobject.c | |
| parent | 14a3dd716d2da4158739e502e8af8ef12e944cac (diff) | |
| download | cpython-94c65d9a8ff8ec56c2420f46a6622803f7f1b154.zip cpython-94c65d9a8ff8ec56c2420f46a6622803f7f1b154.tar.gz cpython-94c65d9a8ff8ec56c2420f46a6622803f7f1b154.tar.bz2 | |
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
........
Diffstat (limited to 'Objects/enumobject.c')
| -rw-r--r-- | Objects/enumobject.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Objects/enumobject.c b/Objects/enumobject.c index f8e4072..62e55bb 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, |