Merge with 3.3

Kristján Valur Jónsson · Kristján Valur Jónsson · commit 25ea45db8154 · 2014-03-04T23:22:15.000Z
diff --git a/Lib/test/test_range.py b/Lib/test/test_range.py
@@ -380,6 +380,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
@@ -807,7 +807,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
`@@ -807,7 +807,7 @@ rangeiter_setstate(rangeiterobject r, PyObject state)`
`807`	`807`	`long index = PyLong_AsLong(state);`
`808`	`808`	`if (index == -1 && PyErr_Occurred())`
`809`	`809`	`return NULL;`
`810`		`- if (index < 0 \|\| index >= r->len) {`
	`810`	`+ if (index < 0 \|\| index > r->len) {`
`811`	`811`	`PyErr_SetString(PyExc_ValueError, "index out of range");`
`812`	`812`	`return NULL;`
`813`	`813`	`}`