diff options
| author | Fredrik Lundh <fredrik@pythonware.com> | 2006-05-30 17:39:58 (GMT) |
|---|---|---|
| committer | Fredrik Lundh <fredrik@pythonware.com> | 2006-05-30 17:39:58 (GMT) |
| commit | 9e9ef9fa5a789f02a04c08998c4b74af9686e43a (patch) | |
| tree | b91231451b625b956e3d7fd3e7d6212672a0479d | |
| parent | 4182a755717a6c05637ec1a44445e4524102928b (diff) | |
| download | cpython-9e9ef9fa5a789f02a04c08998c4b74af9686e43a.zip cpython-9e9ef9fa5a789f02a04c08998c4b74af9686e43a.tar.gz cpython-9e9ef9fa5a789f02a04c08998c4b74af9686e43a.tar.bz2 | |
changed count to return 0 for slices outside the source string
| -rw-r--r-- | Lib/test/string_tests.py | 3 | ||||
| -rw-r--r-- | Objects/stringlib/count.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py index c2e0875..8962c1f 100644 --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -115,7 +115,8 @@ class CommonTest(unittest.TestCase): 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(1, 'aaa', 'count', '', 3) + self.checkequal(0, 'aaa', 'count', '', 10) self.checkequal(2, 'aaa', 'count', '', -1) self.checkequal(4, 'aaa', 'count', '', -10) diff --git a/Objects/stringlib/count.h b/Objects/stringlib/count.h index 84a852f..367a15c 100644 --- a/Objects/stringlib/count.h +++ b/Objects/stringlib/count.h @@ -15,7 +15,7 @@ stringlib_count(const STRINGLIB_CHAR* str, Py_ssize_t str_len, if (sub_len == 0) { if (str_len < 0) - return 1; /* start >= len(str) */ + return 0; /* start > len(str) */ return str_len + 1; } |