Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Guido has Spoken. Restore strop.replace()'s treatment of a 0 count as 

meaning infinity -- but at least warn about it in the code!  I pissed
away a couple hours on this today, and don't wish the same on the next
in line.
Bugfix candidate.
This commit is contained in:
Tim Peters 2001-05-10 01:23:39 +00:00
parent da45d55a6e
commit 1ee77d9b71
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_strop.py
View File

@ -77,7 +77,9 @@ test('replace', 'one!two!three!', 'one@two!three!', '!', '@', 1)
test('replace', 'one!two!three!', 'one@two@three!', '!', '@', 2)
test('replace', 'one!two!three!', 'one@two@three@', '!', '@', 3)
test('replace', 'one!two!three!', 'one@two@three@', '!', '@', 4)
test('replace', 'one!two!three!', 'one!two!three!', '!', '@', 0)
# CAUTION: a replace count of 0 means infinity only to strop, not to the
# string .replace() method or to the string.replace() function.
test('replace', 'one!two!three!', 'one@two@three@', '!', '@', 0)
test('replace', 'one!two!three!', 'one@two@three@', '!', '@')
test('replace', 'one!two!three!', 'one!two!three!', 'x', '@')
test('replace', 'one!two!three!', 'one!two!three!', 'x', '@', 2)

6
Modules/stropmodule.c
View File

@ -1132,6 +1132,12 @@ strop_replace(PyObject *self, PyObject *args)
PyErr_SetString(PyExc_ValueError, "empty pattern string");
return NULL;
}
/* CAUTION: strop treats a replace count of 0 as infinity, unlke
* current (2.1) string.py and string methods. Preserve this for
* ... well, hard to say for what <wink>.
*/
if (count == 0)
count = -1;
new_s = mymemreplace(str,len,pat,pat_len,sub,sub_len,count,&out_len);
if (new_s == NULL) {
PyErr_NoMemory();