traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #23803: Fixed str.partition() and str.rpartition() when a separator 

is wider then partitioned string.
This commit is contained in:
Serhiy Storchaka 2015-03-29 19:21:02 +03:00
parent 9db55004a1
commit 48070c1248
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_unicode.py
View File

@ -375,6 +375,7 @@ class UnicodeTest(string_tests.CommonTest,
def test_partition(self): def test_partition(self):
string_tests.MixinStrUnicodeUserStringTest.test_partition(self) string_tests.MixinStrUnicodeUserStringTest.test_partition(self)
# test mixed kinds # test mixed kinds
self.checkequal(('ABCDEFGH', '', ''), 'ABCDEFGH', 'partition', '\u4200')
for left, right in ('ba', '\u0101\u0100', '\U00010301\U00010300'): for left, right in ('ba', '\u0101\u0100', '\U00010301\U00010300'):
left *= 9 left *= 9
right *= 9 right *= 9
@ -391,6 +392,7 @@ class UnicodeTest(string_tests.CommonTest,
def test_rpartition(self): def test_rpartition(self):
string_tests.MixinStrUnicodeUserStringTest.test_rpartition(self) string_tests.MixinStrUnicodeUserStringTest.test_rpartition(self)
# test mixed kinds # test mixed kinds
self.checkequal(('', '', 'ABCDEFGH'), 'ABCDEFGH', 'rpartition', '\u4200')
for left, right in ('ba', '\u0101\u0100', '\U00010301\U00010300'): for left, right in ('ba', '\u0101\u0100', '\U00010301\U00010300'):
left *= 9 left *= 9
right *= 9 right *= 9

3
Misc/NEWS
View File

@ -10,6 +10,9 @@ Release date: tba
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #23803: Fixed str.partition() and str.rpartition() when a separator
is wider then partitioned string.
- Issue #23192: Fixed generator lambdas. Patch by Bruno Cauet. - Issue #23192: Fixed generator lambdas. Patch by Bruno Cauet.
- Issue #23629: Fix the default __sizeof__ implementation for variable-sized - Issue #23629: Fix the default __sizeof__ implementation for variable-sized

10
Objects/unicodeobject.c
View File

@ -12681,7 +12681,7 @@ PyUnicode_Partition(PyObject *str_in, PyObject *sep_in)
len1 = PyUnicode_GET_LENGTH(str_obj); len1 = PyUnicode_GET_LENGTH(str_obj);
len2 = PyUnicode_GET_LENGTH(sep_obj); len2 = PyUnicode_GET_LENGTH(sep_obj);
switch (PyUnicode_KIND(str_obj)) { switch (kind) {
case PyUnicode_1BYTE_KIND: case PyUnicode_1BYTE_KIND:
if (PyUnicode_IS_ASCII(str_obj) && PyUnicode_IS_ASCII(sep_obj)) if (PyUnicode_IS_ASCII(str_obj) && PyUnicode_IS_ASCII(sep_obj))
out = asciilib_partition(str_obj, buf1, len1, sep_obj, buf2, len2); out = asciilib_partition(str_obj, buf1, len1, sep_obj, buf2, len2);
@ -12737,12 +12737,12 @@ PyUnicode_RPartition(PyObject *str_in, PyObject *sep_in)
return NULL; return NULL;
} }
kind1 = PyUnicode_KIND(str_in); kind1 = PyUnicode_KIND(str_obj);
kind2 = PyUnicode_KIND(sep_obj); kind2 = PyUnicode_KIND(sep_obj);
kind = Py_MAX(kind1, kind2); kind = Py_MAX(kind1, kind2);
buf1 = PyUnicode_DATA(str_in); buf1 = PyUnicode_DATA(str_obj);
if (kind1 != kind) if (kind1 != kind)
buf1 = _PyUnicode_AsKind(str_in, kind); buf1 = _PyUnicode_AsKind(str_obj, kind);
if (!buf1) if (!buf1)
goto onError; goto onError;
buf2 = PyUnicode_DATA(sep_obj); buf2 = PyUnicode_DATA(sep_obj);
@ -12753,7 +12753,7 @@ PyUnicode_RPartition(PyObject *str_in, PyObject *sep_in)
len1 = PyUnicode_GET_LENGTH(str_obj); len1 = PyUnicode_GET_LENGTH(str_obj);
len2 = PyUnicode_GET_LENGTH(sep_obj); len2 = PyUnicode_GET_LENGTH(sep_obj);
switch (PyUnicode_KIND(str_in)) { switch (kind) {
case PyUnicode_1BYTE_KIND: case PyUnicode_1BYTE_KIND:
if (PyUnicode_IS_ASCII(str_obj) && PyUnicode_IS_ASCII(sep_obj)) if (PyUnicode_IS_ASCII(str_obj) && PyUnicode_IS_ASCII(sep_obj))
out = asciilib_rpartition(str_obj, buf1, len1, sep_obj, buf2, len2); out = asciilib_rpartition(str_obj, buf1, len1, sep_obj, buf2, len2);