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 96fc7cd12c68e055ff619eb9168c806ff64afb1a..3def1343c05a4f6d133819b4908278be979cd5f2 100644 (file)
--- 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");