summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2003-10-22 02:56:40 (GMT)
committerFred Drake <fdrake@acm.org>2003-10-22 02:56:40 (GMT)
commitd22bb6584d61b822bd1d6841a40f50d31aba650c (patch)
tree439652caee3b83fc658eda3ffae97a675a90b6ac
parentf12f32421f827caa42553dadc6d2a71c92656490 (diff)
downloadcpython-d22bb6584d61b822bd1d6841a40f50d31aba650c.zip
cpython-d22bb6584d61b822bd1d6841a40f50d31aba650c.tar.gz
cpython-d22bb6584d61b822bd1d6841a40f50d31aba650c.tar.bz2
Avoid confusing name for the 3rd argument to str.replace().
This closes SF bug #827260.
-rw-r--r--Doc/lib/libstdtypes.tex6
-rw-r--r--Objects/stringobject.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/Doc/lib/libstdtypes.tex b/Doc/lib/libstdtypes.tex
index d19926d..bffcea9 100644
--- a/Doc/lib/libstdtypes.tex
+++ b/Doc/lib/libstdtypes.tex
@@ -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
\code{'strict'}, meaning that encoding errors raise
\exception{ValueError}. Other possible values are \code{'ignore'} and
-\code{replace'}.
+\code{'replace'}.
\versionadded{2.2}
\end{methoddesc}
@@ -664,10 +664,10 @@ the string this method is called on.
\versionchanged[Support for the \var{chars} argument]{2.2.2}
\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
\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.
\end{methoddesc}
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 7143a81..0a22440 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -2308,11 +2308,11 @@ mymemreplace(const char *str, int len, /* input string */
PyDoc_STRVAR(replace__doc__,
-"S.replace (old, new[, maxsplit]) -> string\n\
+"S.replace (old, new[, count]) -> string\n\
\n\
Return a copy of string S with all occurrences of substring\n\
-old replaced by new. If the optional argument maxsplit is\n\
-given, only the first maxsplit occurrences are replaced.");
+old replaced by new. If the optional argument count is\n\
+given, only the first count occurrences are replaced.");
static PyObject *
string_replace(PyStringObject *self, PyObject *args)