Fix pickling of rangeiter. rangeiter_setstate would not allow setting it

to the exhausted state.
This commit is contained in:
Kristján Valur Jónsson 2014-03-04 23:19:24 +00:00
parent 682ea5f70e
commit 4ca688edeb
2 changed files with 13 additions and 1 deletions

View File

@ -379,6 +379,18 @@ class RangeTest(unittest.TestCase):
it = pickle.loads(d) it = pickle.loads(d)
self.assertEqual(list(it), data[1:]) self.assertEqual(list(it), data[1:])
def test_exhausted_iterator_pickling(self):
r = range(20)
i = iter(r)
while True:
r = next(i)
if r == 19:
break
d = pickle.dumps(i)
i2 = pickle.loads(d)
self.assertEqual(list(i), [])
self.assertEqual(list(i2), [])
def test_odd_bug(self): def test_odd_bug(self):
# This used to raise a "SystemError: NULL result without error" # This used to raise a "SystemError: NULL result without error"
# because the range validation step was eating the exception # because the range validation step was eating the exception

View File

@ -1000,7 +1000,7 @@ rangeiter_setstate(rangeiterobject *r, PyObject *state)
long index = PyLong_AsLong(state); long index = PyLong_AsLong(state);
if (index == -1 && PyErr_Occurred()) if (index == -1 && PyErr_Occurred())
return NULL; return NULL;
if (index < 0 || index >= r->len) { if (index < 0 || index > r->len) {
PyErr_SetString(PyExc_ValueError, "index out of range"); PyErr_SetString(PyExc_ValueError, "index out of range");
return NULL; return NULL;
} }