Fix pickling of rangeiter. rangeiter_setstate would not allow setting it

Kristján Valur Jónsson · Kristján Valur Jónsson · commit 4ca688edeb07 · 2014-03-04T23:19:24.000Z
to the exhausted state.
diff --git a/Lib/test/test_range.py b/Lib/test/test_range.py
@@ -379,6 +379,18 @@ def test_iterator_pickling(self):
                 it = pickle.loads(d)
                 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):
         # This used to raise a "SystemError: NULL result without error"
         # because the range validation step was eating the exception
diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c
@@ -1000,7 +1000,7 @@ rangeiter_setstate(rangeiterobject *r, PyObject *state)
     long index = PyLong_AsLong(state);
     if (index == -1 && PyErr_Occurred())
         return NULL;
-    if (index < 0 || index >= r->len) {
+    if (index < 0 || index > r->len) {
         PyErr_SetString(PyExc_ValueError, "index out of range");
         return NULL;
     }

Original file line number	Diff line number	Diff line change
`@@ -1000,7 +1000,7 @@ rangeiter_setstate(rangeiterobject r, PyObject state)`
`1000`	`1000`	`long index = PyLong_AsLong(state);`
`1001`	`1001`	`if (index == -1 && PyErr_Occurred())`
`1002`	`1002`	`return NULL;`
`1003`		`- if (index < 0 \|\| index >= r->len) {`
	`1003`	`+ if (index < 0 \|\| index > r->len) {`
`1004`	`1004`	`PyErr_SetString(PyExc_ValueError, "index out of range");`
`1005`	`1005`	`return NULL;`
`1006`	`1006`	`}`