From: Fred Drake <fdrake@acm.org>
Date: Wed, 22 Oct 2003 02:57:23 +0000 (+0000)
Subject: Avoid confusing name for the 3rd argument to str.replace().
X-Git-Tag: v2.3.3c1~115
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c7cd9cff3c1bbddd8f1d8d63f851eb0d0e36e5e8;p=thirdparty%2FPython%2Fcpython.git

Avoid confusing name for the 3rd argument to str.replace().
This closes SF bug #827260.
---

diff --git a/Doc/lib/libstdtypes.tex b/Doc/lib/libstdtypes.tex
index 91b0319ad97c..bc602d806887 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 7143a8159639..0a2244067102 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)