commit fcdaaa9011be28d4653dadc92df4a94b2f669711
author Senthil Kumaran <senthil@uthcode.com> Wed Jul 27 23:34:29 2011 +0800
committer Senthil Kumaran <senthil@uthcode.com> Wed Jul 27 23:34:29 2011 +0800
tree 8b7d65a050221fc2804282fa5a12bdbfeaae9c3f
parent 114f0e499d1a9c4b63a827f23fdc87937d17fa10
parent 53516a82df8db500a968451daa54fc72eaed7056

merge from 3.2 - Fix closes Issue12621 - Fix docstrings of find and rfind methods of bytes/bytearry/unicodeobject.

Objects/bytearrayobject.c

diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index fba5758..37668c7 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -1102,7 +1102,7 @@
 "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.");
@@ -1196,7 +1196,7 @@
 "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.");

Objects/bytesobject.c

diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index ea14be6..43d8381 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -1269,7 +1269,7 @@
 "B.find(sub[, start[, end]]) -> int\n\
 \n\
 Return the lowest index in B where substring 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.");
@@ -1308,7 +1308,7 @@
 "B.rfind(sub[, start[, end]]) -> int\n\
 \n\
 Return the highest index in B where substring 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.");

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 9ecf89b..bef2abf 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -7660,7 +7660,7 @@
              "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.");
@@ -8587,7 +8587,7 @@
              "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.");