mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-15 11:22:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 72518 via svnmerge from

Browse source 
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
........
This commit is contained in:
Benjamin Peterson 2009-05-09 19:24:36 +00:00
parent 3131bb107d
commit e18df23d5d
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Objects/abstract.c
View file

@ -98,6 +98,7 @@ _PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue)
if (ro == NULL) { if (ro == NULL) {
if (!PyErr_ExceptionMatches(PyExc_TypeError)) if (!PyErr_ExceptionMatches(PyExc_TypeError))
return -1; return -1;
PyErr_Clear();
return defaultvalue; return defaultvalue;
} }
rv = PyLong_Check(ro) ? PyLong_AsSsize_t(ro) : defaultvalue; rv = PyLong_Check(ro) ? PyLong_AsSsize_t(ro) : defaultvalue;