diff options
author | Marc-André Lemburg <mal@egenix.com> | 2001-01-16 11:54:12 (GMT) |
---|---|---|
committer | Marc-André Lemburg <mal@egenix.com> | 2001-01-16 11:54:12 (GMT) |
commit | 3a645e4dd4eebbfbbfad8443558bb3b879e23896 (patch) | |
tree | 97fdb22065892ae35ce0f25bf62fbae5718df32d /Lib/test | |
parent | 1c5aa6901fb13f8112ead1786868f0f8ed4c9e2d (diff) | |
download | cpython-3a645e4dd4eebbfbbfad8443558bb3b879e23896.zip cpython-3a645e4dd4eebbfbbfad8443558bb3b879e23896.tar.gz cpython-3a645e4dd4eebbfbbfad8443558bb3b879e23896.tar.bz2 |
Added checks to prevent PyUnicode_Count() from dumping core
in case the parameters are out of bounds and fixes error handling
for .count(), .startswith() and .endswith() for the case of
mixed string/Unicode objects.
This patch adds Python style index semantics to PyUnicode_Count()
indices (including the special handling of negative indices).
The patch is an extended version of patch #103249 submitted
by Michael Hudson (mwh) on SF. It also includes new test cases.
Diffstat (limited to 'Lib/test')
-rw-r--r-- | Lib/test/string_tests.py | 4 | ||||
-rw-r--r-- | Lib/test/test_unicode.py | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py index d4041be..067ccca 100644 --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -53,6 +53,10 @@ def run_method_tests(test): test('capitalize', ' hello ', ' hello ') test('capitalize', 'hello ', 'Hello ') + + test('count', 'aaa', 3, 'a') + test('count', 'aaa', 0, 'b') + test('find', 'abcdefghiabc', 0, 'abc') test('find', 'abcdefghiabc', 9, 'abc', 1) test('find', 'abcdefghiabc', -1, 'def', 4) diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index 579bab1..c71f927 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -32,6 +32,13 @@ def test(method, input, output, *args): test('capitalize', u' hello ', u' hello ') test('capitalize', u'hello ', u'Hello ') +test('count', u'aaa', 3, u'a') +test('count', u'aaa', 0, u'b') +test('count', 'aaa', 3, u'a') +test('count', 'aaa', 0, u'b') +test('count', u'aaa', 3, 'a') +test('count', u'aaa', 0, 'b') + test('title', u' hello ', u' Hello ') test('title', u'hello ', u'Hello ') test('title', u"fOrMaT thIs aS titLe String", u'Format This As Title String') |