[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2

Wed Jan 11 09:33:44 CET 2012

http://hg.python.org/cpython/rev/0df85a2ebe4d
changeset: 74332:0df85a2ebe4d
parent: 74328:0c5266390992
parent: 74331:3f2e5fd17b76
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Wed Jan 11 03:32:43 2012 -0500
summary:
 Merge with 3.2
#13754 String returned if less than *or equal to* x 3
*13753 'seq' now 'iterable'
files:
 Doc/library/stdtypes.rst | 8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1193,7 +1193,7 @@
 
 Return a string which is the concatenation of the strings in the
 :term:`iterable` *iterable*. A :exc:`TypeError` will be raised if there are
- any non-string values in *seq*, including :class:`bytes` objects. The
+ any non-string values in *iterable*, including :class:`bytes` objects. The
 separator between elements is the string providing this method.
 
 
@@ -1201,7 +1201,7 @@
 
 Return the string left justified in a string of length *width*. Padding is done
 using the specified *fillchar* (default is a space). The original string is
- returned if *width* is less than ``len(s)``.
+ returned if *width* is less than or equal to ``len(s)``.
 
 
 .. method:: str.lower()
@@ -1270,7 +1270,7 @@
 
 Return the string right justified in a string of length *width*. Padding is done
 using the specified *fillchar* (default is a space). The original string is
- returned if *width* is less than ``len(s)``.
+ returned if *width* is less than or equal to ``len(s)``.
 
 
 .. method:: str.rpartition(sep)
@@ -1418,7 +1418,7 @@
 
 Return the numeric string left filled with zeros in a string of length
 *width*. A sign prefix is handled correctly. The original string is
- returned if *width* is less than ``len(s)``.
+ returned if *width* is less than or equal to ``len(s)``.
 
 
 
-- 
Repository URL: http://hg.python.org/cpython
