diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-09-26 22:34:08 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-09-26 22:34:08 (GMT) |
| commit | fc5ea3928947152d60c3a1d1c456345a64774cf0 (patch) | |
| tree | 53e7293433b59bdac7f4150cfaafd2efdcdbc98e /Lib/test | |
| parent | da84d21a0c5fdd1da0fbc2d3638e3ee34731dd2c (diff) | |
| download | cpython-fc5ea3928947152d60c3a1d1c456345a64774cf0.zip cpython-fc5ea3928947152d60c3a1d1c456345a64774cf0.tar.gz cpython-fc5ea3928947152d60c3a1d1c456345a64774cf0.tar.bz2 | |
#3967: Correct a crash in count() and find() methods of string-like objects.
For example:
"".count("xxxx", sys.maxint, 0)
Reviewed by Benjamin Peterson.
Will port to 2.5 and 3.0.
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/string_tests.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py index 63279ec..e66855d 100644 --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -120,6 +120,14 @@ class CommonTest(unittest.TestCase): self.checkequal(2, 'aaa', 'count', '', -1) self.checkequal(4, 'aaa', 'count', '', -10) + self.checkequal(1, '', 'count', '') + self.checkequal(0, '', 'count', '', 1, 1) + self.checkequal(0, '', 'count', '', sys.maxint, 0) + + self.checkequal(0, '', 'count', 'xx') + self.checkequal(0, '', 'count', 'xx', 1, 1) + self.checkequal(0, '', 'count', 'xx', sys.maxint, 0) + self.checkraises(TypeError, 'hello', 'count') self.checkraises(TypeError, 'hello', 'count', 42) @@ -169,6 +177,14 @@ class CommonTest(unittest.TestCase): self.checkraises(TypeError, 'hello', 'find') self.checkraises(TypeError, 'hello', 'find', 42) + self.checkequal(0, '', 'find', '') + self.checkequal(-1, '', 'find', '', 1, 1) + self.checkequal(-1, '', 'find', '', sys.maxint, 0) + + self.checkequal(-1, '', 'find', 'xx') + self.checkequal(-1, '', 'find', 'xx', 1, 1) + self.checkequal(-1, '', 'find', 'xx', sys.maxint, 0) + # For a variety of combinations, # verify that str.find() matches __contains__ # and that the found substring is really at that location |