traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Factor out common iterator finalization code

This commit is contained in:
Raymond Hettinger 2015-10-02 23:17:33 -07:00
parent bfc01028bb
commit fd265f4a18
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Modules/_collectionsmodule.c
View File

@ -350,21 +350,34 @@ deque_appendleft(dequeobject *deque, PyObject *item)
PyDoc_STRVAR(appendleft_doc, "Add an element to the left side of the deque."); PyDoc_STRVAR(appendleft_doc, "Add an element to the left side of the deque.");
static PyObject*
finalize_iterator(PyObject *it)
{
if (PyErr_Occurred()) {
if (PyErr_ExceptionMatches(PyExc_StopIteration))
PyErr_Clear();
else {
Py_DECREF(it);
return NULL;
}
}
Py_DECREF(it);
Py_RETURN_NONE;
}
/* Run an iterator to exhaustion. Shortcut for /* Run an iterator to exhaustion. Shortcut for
the extend/extendleft methods when maxlen == 0. */ the extend/extendleft methods when maxlen == 0. */
static PyObject* static PyObject*
consume_iterator(PyObject *it) consume_iterator(PyObject *it)
{ {
PyObject *(*iternext)(PyObject *);
PyObject *item; PyObject *item;
while ((item = PyIter_Next(it)) != NULL) { iternext = *Py_TYPE(it)->tp_iternext;
while ((item = iternext(it)) != NULL) {
Py_DECREF(item); Py_DECREF(item);
} }
Py_DECREF(it); return finalize_iterator(it);
if (PyErr_Occurred())
return NULL;
Py_RETURN_NONE;
} }
static PyObject * static PyObject *
@ -423,16 +436,7 @@ deque_extend(dequeobject *deque, PyObject *iterable)
if (trim) if (trim)
deque_trim_left(deque); deque_trim_left(deque);
} }
if (PyErr_Occurred()) { return finalize_iterator(it);
if (PyErr_ExceptionMatches(PyExc_StopIteration))
PyErr_Clear();
else {
Py_DECREF(it);
return NULL;
}
}
Py_DECREF(it);
Py_RETURN_NONE;
} }
PyDoc_STRVAR(extend_doc, PyDoc_STRVAR(extend_doc,
@ -494,16 +498,7 @@ deque_extendleft(dequeobject *deque, PyObject *iterable)
if (trim) if (trim)
deque_trim_right(deque); deque_trim_right(deque);
} }
if (PyErr_Occurred()) { return finalize_iterator(it);
if (PyErr_ExceptionMatches(PyExc_StopIteration))
PyErr_Clear();
else {
Py_DECREF(it);
return NULL;
}
}
Py_DECREF(it);
Py_RETURN_NONE;
} }
PyDoc_STRVAR(extendleft_doc, PyDoc_STRVAR(extendleft_doc,