diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-09-26 22:46:01 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-09-26 22:46:01 (GMT) |
| commit | b50f9926ca1a6d9e55871979e494511db4bc9da4 (patch) | |
| tree | d075eb4550f9352f5704b86fb3ec425cb2f65e85 /Lib | |
| parent | 4235e6f1117e6b35d183bf46487261d762486b1a (diff) | |
| download | cpython-b50f9926ca1a6d9e55871979e494511db4bc9da4.zip cpython-b50f9926ca1a6d9e55871979e494511db4bc9da4.tar.gz cpython-b50f9926ca1a6d9e55871979e494511db4bc9da4.tar.bz2 | |
#3967: Correct a crash in count() and find() methods of string-like objects.
For example:
"".count("xxxx", sys.maxint, 0)
Backport of r66631.
Diffstat (limited to 'Lib')
| -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 e56bc02..31da13d 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) @@ -162,6 +170,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 |