diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2010-01-29 17:29:21 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2010-01-29 17:29:21 (GMT) |
| commit | a53f2c997eb6070cc59a6675a10514c9e18f2c9e (patch) | |
| tree | 138284fbad6d5684f473111a4a2d4e1006d1b4dc /Lib | |
| parent | d692c4a754c7a389d4dba4ca1f1d67ce5287e92d (diff) | |
| download | cpython-a53f2c997eb6070cc59a6675a10514c9e18f2c9e.zip cpython-a53f2c997eb6070cc59a6675a10514c9e18f2c9e.tar.gz cpython-a53f2c997eb6070cc59a6675a10514c9e18f2c9e.tar.bz2 | |
Merged revisions 77823 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r77823 | mark.dickinson | 2010-01-29 17:27:24 +0000 (Fri, 29 Jan 2010) | 10 lines
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 93c6cc0..dd01574 100755 --- a/Lib/test/test_array.py +++ b/Lib/test/test_array.py @@ -848,6 +848,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 9ccc787..b83a83f 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -595,7 +595,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 |