Commit d22bb658 authored by Fred Drake's avatar Fred Drake

Avoid confusing name for the 3rd argument to str.replace().

This closes SF bug #827260.
parent f12f3242
...@@ -563,7 +563,7 @@ Decodes the string using the codec registered for \var{encoding}. ...@@ -563,7 +563,7 @@ Decodes the string using the codec registered for \var{encoding}.
may be given to set a different error handling scheme. The default is may be given to set a different error handling scheme. The default is
\code{'strict'}, meaning that encoding errors raise \code{'strict'}, meaning that encoding errors raise
\exception{ValueError}. Other possible values are \code{'ignore'} and \exception{ValueError}. Other possible values are \code{'ignore'} and
\code{replace'}. \code{'replace'}.
\versionadded{2.2} \versionadded{2.2}
\end{methoddesc} \end{methoddesc}
...@@ -664,10 +664,10 @@ the string this method is called on. ...@@ -664,10 +664,10 @@ the string this method is called on.
\versionchanged[Support for the \var{chars} argument]{2.2.2} \versionchanged[Support for the \var{chars} argument]{2.2.2}
\end{methoddesc} \end{methoddesc}
\begin{methoddesc}[string]{replace}{old, new\optional{, maxsplit}} \begin{methoddesc}[string]{replace}{old, new\optional{, count}}
Return a copy of the string with all occurrences of substring Return a copy of the string with all occurrences of substring
\var{old} replaced by \var{new}. If the optional argument \var{old} replaced by \var{new}. If the optional argument
\var{maxsplit} is given, only the first \var{maxsplit} occurrences are \var{count} is given, only the first \var{count} occurrences are
replaced. replaced.
\end{methoddesc} \end{methoddesc}
......
...@@ -2308,11 +2308,11 @@ mymemreplace(const char *str, int len, /* input string */ ...@@ -2308,11 +2308,11 @@ mymemreplace(const char *str, int len, /* input string */
PyDoc_STRVAR(replace__doc__, PyDoc_STRVAR(replace__doc__,
"S.replace (old, new[, maxsplit]) -> string\n\ "S.replace (old, new[, count]) -> string\n\
\n\ \n\
Return a copy of string S with all occurrences of substring\n\ Return a copy of string S with all occurrences of substring\n\
old replaced by new. If the optional argument maxsplit is\n\ old replaced by new. If the optional argument count is\n\
given, only the first maxsplit occurrences are replaced."); given, only the first count occurrences are replaced.");
static PyObject * static PyObject *
string_replace(PyStringObject *self, PyObject *args) string_replace(PyStringObject *self, PyObject *args)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment