mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Make PyIter_Next() a little smarter (wrt its knowledge of iterator

Browse source 
internals) so clients can be a lot dumber (wrt their knowledge).
This commit is contained in:
Tim Peters 2001-05-05 00:14:56 +00:00
parent 648b4de3d3
commit f4848dac41
4 changed files with 35 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Objects/abstract.c
View file

@ -1276,17 +1276,9 @@ PySequence_List(PyObject *v)
for (i = 0; ; i++) {
PyObject *item = PyIter_Next(it);
if (item == NULL) {
/* We're out of here in any case, but if this is a
* StopIteration exception it's expected, but if
* any other kind of exception it's an error.
*/
if (PyErr_Occurred()) {
if (PyErr_ExceptionMatches(PyExc_StopIteration))
PyErr_Clear();
else {
Py_DECREF(result);
result = NULL;
}
Py_DECREF(result);
result = NULL;
}
break;
}
@ -1796,14 +1788,27 @@ PyObject_GetIter(PyObject *o)
}
}
/* Return next item.
* If an error occurs, return NULL. PyErr_Occurred() will be true.
* If the iteration terminates normally, return NULL and clear the
* PyExc_StopIteration exception (if it was set). PyErr_Occurred()
* will be false.
* Else return the next object. PyErr_Occurred() will be false.
*/
PyObject *
PyIter_Next(PyObject *iter)
{
PyObject *result;
if (!PyIter_Check(iter)) {
PyErr_Format(PyExc_TypeError,
"'%.100s' object is not an iterator",
iter->ob_type->tp_name);
return NULL;
}
return (*iter->ob_type->tp_iternext)(iter);
result = (*iter->ob_type->tp_iternext)(iter);
if (result == NULL &&
PyErr_Occurred() &&
PyErr_ExceptionMatches(PyExc_StopIteration))
PyErr_Clear();
return result;
}