merge from 3.2 - Fix closes Issue12621 - Fix docstrings of find and rfind methods...

diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 57471c3798f1f7fca4bcc2383fc537084605a61f..a40c0ab7ff74f6bc25ab56ed79b7db65bca4d71d 100644 (file)
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -1170,7 +1170,7 @@ PyDoc_STRVAR(find__doc__,
 "B.find(sub [,start [,end]]) -> int\n\
 \n\
 Return the lowest index in B where subsection sub is found,\n\
-such that sub is contained within s[start,end].  Optional\n\
+such that sub is contained within B[start,end].  Optional\n\
 arguments start and end are interpreted as in slice notation.\n\
 \n\
 Return -1 on failure.");
@@ -1240,7 +1240,7 @@ PyDoc_STRVAR(rfind__doc__,
 "B.rfind(sub [,start [,end]]) -> int\n\
 \n\
 Return the highest index in B where subsection sub is found,\n\
-such that sub is contained within s[start,end].  Optional\n\
+such that sub is contained within B[start,end].  Optional\n\
 arguments start and end are interpreted as in slice notation.\n\
 \n\
 Return -1 on failure.");

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index b3b79b8d59e815feed37f46883f0c82a22268315..d6c4f770e33093d41f45bcd7e959fdaa0cede03c 100644 (file)
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -1727,7 +1727,7 @@ PyDoc_STRVAR(find__doc__,
 "S.find(sub [,start [,end]]) -> int\n\
 \n\
 Return the lowest index in S where substring sub is found,\n\
-such that sub is contained within s[start:end].  Optional\n\
+such that sub is contained within S[start:end].  Optional\n\
 arguments start and end are interpreted as in slice notation.\n\
 \n\
 Return -1 on failure.");
@@ -1766,7 +1766,7 @@ PyDoc_STRVAR(rfind__doc__,
 "S.rfind(sub [,start [,end]]) -> int\n\
 \n\
 Return the highest index in S where substring sub is found,\n\
-such that sub is contained within s[start:end].  Optional\n\
+such that sub is contained within S[start:end].  Optional\n\
 arguments start and end are interpreted as in slice notation.\n\
 \n\
 Return -1 on failure.");

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index b2332a536081eb66687f69bf45a4114f59119ecc..af259a01ba34c35cf64bab06d33bd448841978e6 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -6491,7 +6491,7 @@ PyDoc_STRVAR(find__doc__,
              "S.find(sub [,start [,end]]) -> int\n\
 \n\
 Return the lowest index in S where substring sub is found,\n\
-such that sub is contained within s[start:end].  Optional\n\
+such that sub is contained within S[start:end].  Optional\n\
 arguments start and end are interpreted as in slice notation.\n\
 \n\
 Return -1 on failure.");
@@ -7226,7 +7226,7 @@ PyDoc_STRVAR(rfind__doc__,
              "S.rfind(sub [,start [,end]]) -> int\n\
 \n\
 Return the highest index in S where substring sub is found,\n\
-such that sub is contained within s[start:end].  Optional\n\
+such that sub is contained within S[start:end].  Optional\n\
 arguments start and end are interpreted as in slice notation.\n\
 \n\
 Return -1 on failure.");