diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2007-06-11 04:32:41 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2007-06-11 04:32:41 (GMT) |
| commit | 8355dd58061649b64b253d6fdff3fd67ac3a4f49 (patch) | |
| tree | 3b7e7d2a12d2e6431e8fb9bd6138b08d391fd5d0 /Lib/test/string_tests.py | |
| parent | 11c5275c6129c2600a29111c9529d1e51aaf3cb6 (diff) | |
| download | cpython-8355dd58061649b64b253d6fdff3fd67ac3a4f49.zip cpython-8355dd58061649b64b253d6fdff3fd67ac3a4f49.tar.gz cpython-8355dd58061649b64b253d6fdff3fd67ac3a4f49.tar.bz2 | |
Backport 55874:
Fix a bug when there was a newline in the string expandtabs was called on.
This also catches another condition that can overflow.
Diffstat (limited to 'Lib/test/string_tests.py')
| -rw-r--r-- | Lib/test/string_tests.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py index b257d57..69a2225 100644 --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -247,8 +247,13 @@ class CommonTest(unittest.TestCase): self.checkequal('abc\rab def\ng hi', 'abc\rab\tdef\ng\thi', 'expandtabs') self.checkequal('abc\rab def\ng hi', 'abc\rab\tdef\ng\thi', 'expandtabs', 8) self.checkequal('abc\r\nab\r\ndef\ng\r\nhi', 'abc\r\nab\r\ndef\ng\r\nhi', 'expandtabs', 4) + self.checkequal(' a\n b', ' \ta\n\tb', 'expandtabs', 1) self.checkraises(TypeError, 'hello', 'expandtabs', 42, 42) + # This test is only valid when sizeof(int) == sizeof(void*) == 4. + if sys.maxint < (1 << 32) and struct.calcsize('P') == 4: + self.checkraises(OverflowError, + '\ta\n\tb', 'expandtabs', sys.maxint) def test_split(self): self.checkequal(['this', 'is', 'the', 'split', 'function'], |
