mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

bpo-28029: Make "".replace("", s, n) returning s for any n != 0. (GH-16981)

Browse source
This commit is contained in:
Serhiy Storchaka 2019-10-30 12:03:53 +02:00 • committed by GitHub
parent 25fc088607
commit 865c3b257f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Objects/stringlib/transmogrify.h
View file

@ -680,9 +680,13 @@ stringlib_replace(PyObject *self,
const char *to_s, Py_ssize_t to_len,
Py_ssize_t maxcount)
{
if (STRINGLIB_LEN(self) < from_len) {
/* nothing to do; return the original bytes */
return return_self(self);
}
if (maxcount < 0) {
maxcount = PY_SSIZE_T_MAX;
} else if (maxcount == 0 || STRINGLIB_LEN(self) == 0) {
} else if (maxcount == 0) {
/* nothing to do; return the original bytes */
return return_self(self);
}
@ -699,13 +703,6 @@ stringlib_replace(PyObject *self,
return stringlib_replace_interleave(self, to_s, to_len, maxcount);
}
/* Except for b"".replace(b"", b"A") == b"A" there is no way beyond this */
/* point for an empty self bytes to generate a non-empty bytes */
/* Special case so the remaining code always gets a non-empty bytes */
if (STRINGLIB_LEN(self) == 0) {
return return_self(self);
}
if (to_len == 0) {
/* delete all occurrences of 'from' bytes */
if (from_len == 1) {

5
Objects/unicodeobject.c
View file

@ -10572,9 +10572,12 @@ replace(PyObject *self, PyObject *str1,
int mayshrink;
Py_UCS4 maxchar, maxchar_str1, maxchar_str2;
if (slen < len1)
goto nothing;
if (maxcount < 0)
maxcount = PY_SSIZE_T_MAX;
else if (maxcount == 0 || slen == 0)
else if (maxcount == 0)
goto nothing;
if (str1 == str2)