mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 09:45:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #26492: Exhausted iterator of array.array now conforms with the behavior

Browse source 
of iterators of other mutable sequences: it lefts exhausted even if iterated
array is extended.
This commit is contained in:
Serhiy Storchaka 2016-03-30 21:11:16 +03:00
parent f39c0ac62f
commit ab0d198c7a
3 changed files with 41 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Modules/arraymodule.c
View file

@ -2875,9 +2875,20 @@ array_iter(arrayobject *ao)
static PyObject *
arrayiter_next(arrayiterobject *it)
{
arrayobject *ao;
assert(it != NULL);
assert(PyArrayIter_Check(it));
if (it->index < Py_SIZE(it->ao))
return (*it->getitem)(it->ao, it->index++);
ao = it->ao;
if (ao == NULL) {
return NULL;
}
assert(array_Check(ao));
if (it->index < Py_SIZE(ao)) {
return (*it->getitem)(ao, it->index++);
}
it->ao = NULL;
Py_DECREF(ao);
return NULL;
}
@ -2906,8 +2917,11 @@ static PyObject *
array_arrayiterator___reduce___impl(arrayiterobject *self)
/*[clinic end generated code: output=7898a52e8e66e016 input=a062ea1e9951417a]*/
{
return Py_BuildValue("N(O)n", _PyObject_GetBuiltin("iter"),
self->ao, self->index);
PyObject *func = _PyObject_GetBuiltin("iter");
if (self->ao == NULL) {
return Py_BuildValue("N(())", func);
}
return Py_BuildValue("N(O)n", func, self->ao, self->index);
}
/*[clinic input]