| commit | 73a088e3fafbfc8b925163a3b0aa626830d26aa0 | [log] [tgz] |
|---|---|---|
| author | Jeremy Hylton <jeremy@alum.mit.edu> | Thu Jul 25 16:43:29 2002 +0000 |
| committer | Jeremy Hylton <jeremy@alum.mit.edu> | Thu Jul 25 16:43:29 2002 +0000 |
| tree | afc0cc41574fd1d5a9a33c6487ce6c906669cbba | |
| parent | 825e47b655623dff7ca515b28fe5d7b0ecfe7ad1 [diff] [blame] |
Don't be so hasty. If PyInt_AsLong() raises an error, don't set ValueError.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 96fc7cd..3def134 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c
@@ -2972,6 +2972,8 @@ return -1; len = (int)PyInt_AsLong(res); Py_DECREF(res); + if (len == -1 && PyErr_Occurred()) + return -1; if (len < 0) { PyErr_SetString(PyExc_ValueError, "__len__() should return >= 0");