Merged revisions 72518 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72518 | benjamin.peterson | 2009-05-09 14:18:36 -0500 (Sat, 09 May 2009) | 1 line

  clear error state properly
........

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 83f536702b3b5b0872650886918b409836902d85..52c90259e86f3e734992371cc7fb12cdbfbacd21 100644 (file)
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -98,6 +98,7 @@ _PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue)
        if (ro == NULL) {
                if (!PyErr_ExceptionMatches(PyExc_TypeError))
                        return -1;
+               PyErr_Clear();
                return defaultvalue;
        }
        rv = PyLong_Check(ro) ? PyLong_AsSsize_t(ro) : defaultvalue;