Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

changed count to return 0 for slices outside the source string

This commit is contained in:
Fredrik Lundh 2006-05-30 17:39:58 +00:00
parent 4182a75571
commit 9e9ef9fa5a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/test/string_tests.py
View File

@ -115,7 +115,8 @@ class CommonTest(unittest.TestCase):
self.checkequal(2, 'aaa', 'count', 'a', 0, -1) self.checkequal(2, 'aaa', 'count', 'a', 0, -1)
self.checkequal(0, 'aaa', 'count', 'a', 0, -10) self.checkequal(0, 'aaa', 'count', 'a', 0, -10)
self.checkequal(3, 'aaa', 'count', '', 1) self.checkequal(3, 'aaa', 'count', '', 1)
self.checkequal(1, 'aaa', 'count', '', 10) self.checkequal(1, 'aaa', 'count', '', 3)
self.checkequal(0, 'aaa', 'count', '', 10)
self.checkequal(2, 'aaa', 'count', '', -1) self.checkequal(2, 'aaa', 'count', '', -1)
self.checkequal(4, 'aaa', 'count', '', -10) self.checkequal(4, 'aaa', 'count', '', -10)

2
Objects/stringlib/count.h
View File

@ -15,7 +15,7 @@ stringlib_count(const STRINGLIB_CHAR* str, Py_ssize_t str_len,
if (sub_len == 0) { if (sub_len == 0) {
if (str_len < 0) if (str_len < 0)
return 1; /* start >= len(str) */ return 0; /* start > len(str) */
return str_len + 1; return str_len + 1;
} }