diff options
| -rw-r--r-- | Lib/test/test_strop.py | 4 | ||||
| -rw-r--r-- | Modules/stropmodule.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Lib/test/test_strop.py b/Lib/test/test_strop.py index de7a795..9130088 100644 --- a/Lib/test/test_strop.py +++ b/Lib/test/test_strop.py @@ -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) diff --git a/Modules/stropmodule.c b/Modules/stropmodule.c index aa9cdc7..312e0dc 100644 --- a/Modules/stropmodule.c +++ b/Modules/stropmodule.c @@ -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(); |