Fix typo in replace() detected by Mark Hammond and fixed by Marc-Andre.

This commit is contained in:
Guido van Rossum 2000-03-13 15:56:08 +00:00
parent 403d68b484
commit 96a45adf80
1 changed files with 4 additions and 2 deletions

View File

@ -389,7 +389,9 @@ PyObject *a, *el;
{ {
register char *s, *end; register char *s, *end;
register char c; register char c;
if (!PyString_Check(el) || PyString_Size(el) != 1) { if (!PyString_Check(el))
return PyUnicode_Contains(a, el);
if (PyString_Size(el) != 1) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"string member test needs char left operand"); "string member test needs char left operand");
return -1; return -1;
@ -1575,7 +1577,7 @@ string_replace(self, args)
else if (PyObject_AsCharBuffer(replobj, &repl, &repl_len)) else if (PyObject_AsCharBuffer(replobj, &repl, &repl_len))
return NULL; return NULL;
if (repl_len <= 0) { if (sub_len <= 0) {
PyErr_SetString(PyExc_ValueError, "empty replacement string"); PyErr_SetString(PyExc_ValueError, "empty replacement string");
return NULL; return NULL;
} }