Merged revisions 66631 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66631 | amaury.forgeotdarc | 2008-09-27 00:34:08 +0200 (sam., 27 sept. 2008) | 7 lines
#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.
........
diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py
index 60308d7..2a58e58 100644
--- a/Lib/test/string_tests.py
+++ b/Lib/test/string_tests.py
@@ -107,6 +107,14 @@
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.maxsize, 0)
+
+ self.checkequal(0, '', 'count', 'xx')
+ self.checkequal(0, '', 'count', 'xx', 1, 1)
+ self.checkequal(0, '', 'count', 'xx', sys.maxsize, 0)
+
self.checkraises(TypeError, 'hello', 'count')
self.checkraises(TypeError, 'hello', 'count', 42)
@@ -156,6 +164,14 @@
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.maxsize, 0)
+
+ self.checkequal(-1, '', 'find', 'xx')
+ self.checkequal(-1, '', 'find', 'xx', 1, 1)
+ self.checkequal(-1, '', 'find', 'xx', sys.maxsize, 0)
+
# For a variety of combinations,
# verify that str.find() matches __contains__
# and that the found substring is really at that location