From 73a088e3fafbfc8b925163a3b0aa626830d26aa0 Mon Sep 17 00:00:00 2001 From: Jeremy Hylton Date: Thu, 25 Jul 2002 16:43:29 +0000 Subject: Don't be so hasty. If PyInt_AsLong() raises an error, don't set ValueError. --- Objects/typeobject.c | 2 ++ 1 file changed, 2 insertions(+) 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 @@ slot_sq_length(PyObject *self) 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"); -- cgit v0.12