bpo-45018: Fix rangeiter_reduce in rangeobject.c (GH-27938)
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit 94a3d2a6329ab7941e93ad2f5bcbb8af2b8b80d2)
Co-authored-by: chilaxan <chilaxan@gmail.com>
diff --git a/Lib/test/test_range.py b/Lib/test/test_range.py
index 107c0e2..897162b 100644
--- a/Lib/test/test_range.py
+++ b/Lib/test/test_range.py
@@ -374,26 +374,41 @@ def test_pickling(self):
list(r))
def test_iterator_pickling(self):
- testcases = [(13,), (0, 11), (-22, 10), (20, 3, -1),
- (13, 21, 3), (-2, 2, 2), (2**65, 2**65+2)]
+ testcases = [(13,), (0, 11), (-22, 10), (20, 3, -1), (13, 21, 3),
+ (-2, 2, 2), (2**31-3, 2**31-1), (2**33, 2**33+2),
+ (2**63-3, 2**63-1), (2**65, 2**65+2)]
for proto in range(pickle.HIGHEST_PROTOCOL + 1):
for t in testcases:
- it = itorg = iter(range(*t))
- data = list(range(*t))
+ with self.subTest(proto=proto, t=t):
+ it = itorg = iter(range(*t))
+ data = list(range(*t))
+ d = pickle.dumps(it, proto)
+ it = pickle.loads(d)
+ self.assertEqual(type(itorg), type(it))
+ self.assertEqual(list(it), data)
+
+ it = pickle.loads(d)
+ try:
+ next(it)
+ except StopIteration:
+ continue
+ d = pickle.dumps(it, proto)
+ it = pickle.loads(d)
+ self.assertEqual(list(it), data[1:])
+
+ def test_iterator_pickling_overflowing_index(self):
+ for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+ with self.subTest(proto=proto):
+ it = iter(range(2**32 + 2))
+ _, _, idx = it.__reduce__()
+ self.assertEqual(idx, 0)
+ it.__setstate__(2**32 + 1) # undocumented way to set r->index
+ _, _, idx = it.__reduce__()
+ self.assertEqual(idx, 2**32 + 1)
d = pickle.dumps(it, proto)
it = pickle.loads(d)
- self.assertEqual(type(itorg), type(it))
- self.assertEqual(list(it), data)
-
- it = pickle.loads(d)
- try:
- next(it)
- except StopIteration:
- continue
- d = pickle.dumps(it, proto)
- it = pickle.loads(d)
- self.assertEqual(list(it), data[1:])
+ self.assertEqual(next(it), 2**32 + 1)
def test_exhausted_iterator_pickling(self):
for proto in range(pickle.HIGHEST_PROTOCOL + 1):