diff options
author | Mark Dickinson <dickinsm@gmail.com> | 2010-01-29 17:27:24 (GMT) |
---|---|---|
committer | Mark Dickinson <dickinsm@gmail.com> | 2010-01-29 17:27:24 (GMT) |
commit | bc09964be115a81e6324dbea5b5fc049759e9430 (patch) | |
tree | b58af14e0ed48291a828a07307a28b1c114d9931 /Lib | |
parent | 8b441d0dcdb9380e999f0caead087c4365cb0bdd (diff) | |
download | cpython-bc09964be115a81e6324dbea5b5fc049759e9430.zip cpython-bc09964be115a81e6324dbea5b5fc049759e9430.tar.gz cpython-bc09964be115a81e6324dbea5b5fc049759e9430.tar.bz2 |
Merged revisions 77821 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77821 | mark.dickinson | 2010-01-29 17:11:39 +0000 (Fri, 29 Jan 2010) | 3 lines
Issue #7788: Fix a crash produced by deleting a list slice with huge
step value. Patch by Marcin Bachry.
........
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/test/list_tests.py | 3 | ||||
-rwxr-xr-x | Lib/test/test_array.py | 3 | ||||
-rw-r--r-- | Lib/test/test_bytes.py | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/Lib/test/list_tests.py b/Lib/test/list_tests.py index 67492f3..e2889cc 100644 --- a/Lib/test/list_tests.py +++ b/Lib/test/list_tests.py @@ -540,6 +540,9 @@ class CommonTest(seq_tests.CommonTest): a = self.type2test(range(10)) a[::2] = tuple(range(5)) self.assertEqual(a, self.type2test([0, 1, 1, 3, 2, 5, 3, 7, 4, 9])) + # test issue7788 + a = self.type2test(range(10)) + del a[9::1<<333] def test_constructor_exception_handling(self): # Bug #1242657 diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py index 6ec9bb3..8a3796c 100755 --- a/Lib/test/test_array.py +++ b/Lib/test/test_array.py @@ -1011,6 +1011,9 @@ class NumberTest(BaseTest): a = array.array(self.typecode, range(10)) del a[::1000] self.assertEqual(a, array.array(self.typecode, [1,2,3,4,5,6,7,8,9])) + # test issue7788 + a = array.array(self.typecode, range(10)) + del a[9::1<<333] def test_assignment(self): a = array.array(self.typecode, range(10)) diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py index 73f7c02..0af0685 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -600,7 +600,7 @@ class ByteArrayTest(BaseBytesTest): self.assertEqual(b, bytearray([0, 1, 2, 42, 42, 42, 3, 4, 5, 6, 7, 8, 9])) def test_extended_set_del_slice(self): - indices = (0, None, 1, 3, 19, 300, -1, -2, -31, -300) + indices = (0, None, 1, 3, 19, 300, 1<<333, -1, -2, -31, -300) for start in indices: for stop in indices: # Skip invalid step 0 |