diff options
| author | Fredrik Lundh <fredrik@pythonware.com> | 2006-05-29 22:42:07 (GMT) |
|---|---|---|
| committer | Fredrik Lundh <fredrik@pythonware.com> | 2006-05-29 22:42:07 (GMT) |
| commit | b51b470eb86ded7d3ea26081ca8bc89b4448f962 (patch) | |
| tree | df73580e83c7e9079cccadc25bd5b1cd3fbd5c9d | |
| parent | a355c14fa10e3f533e4749d3cbed273b864d6235 (diff) | |
| download | cpython-b51b470eb86ded7d3ea26081ca8bc89b4448f962.zip cpython-b51b470eb86ded7d3ea26081ca8bc89b4448f962.tar.gz cpython-b51b470eb86ded7d3ea26081ca8bc89b4448f962.tar.bz2 | |
fixed "abc".count("", 100) == -96 error (hopefully, nobody's relying on
the current behaviour ;-)
| -rw-r--r-- | Lib/test/string_tests.py | 8 | ||||
| -rw-r--r-- | Objects/stringlib/count.h | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py index 489af20..5fe9fb9 100644 --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -106,10 +106,18 @@ class CommonTest(unittest.TestCase): self.checkequal(3, 'aaa', 'count', 'a') self.checkequal(0, 'aaa', 'count', 'b') self.checkequal(0, 'aaa', 'count', 'b') + self.checkequal(2, 'aaa', 'count', 'a', 1) + self.checkequal(0, 'aaa', 'count', 'a', 10) self.checkequal(1, 'aaa', 'count', 'a', -1) self.checkequal(3, 'aaa', 'count', 'a', -10) + self.checkequal(1, 'aaa', 'count', 'a', 0, 1) + self.checkequal(3, 'aaa', 'count', 'a', 0, 10) self.checkequal(2, 'aaa', 'count', 'a', 0, -1) self.checkequal(0, 'aaa', 'count', 'a', 0, -10) + self.checkequal(3, 'aaa', 'count', '', 1) + self.checkequal(1, 'aaa', 'count', '', 10) + self.checkequal(2, 'aaa', 'count', '', -1) + self.checkequal(4, 'aaa', 'count', '', -10) self.checkraises(TypeError, 'hello', 'count') self.checkraises(TypeError, 'hello', 'count', 42) diff --git a/Objects/stringlib/count.h b/Objects/stringlib/count.h index 0bd02b5..84a852f 100644 --- a/Objects/stringlib/count.h +++ b/Objects/stringlib/count.h @@ -13,8 +13,11 @@ stringlib_count(const STRINGLIB_CHAR* str, Py_ssize_t str_len, { Py_ssize_t count; - if (sub_len == 0) + if (sub_len == 0) { + if (str_len < 0) + return 1; /* start >= len(str) */ return str_len + 1; + } count = fastsearch(str, str_len, sub, sub_len, FAST_COUNT); |