Merge with 3.3

This commit is contained in:
Kristján Valur Jónsson 2014-03-04 23:22:15 +00:00
commit 25ea45db81
2 changed files with 13 additions and 1 deletions

View file

@ -380,6 +380,18 @@ class RangeTest(unittest.TestCase):
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