diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2012-01-11 08:32:43 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2012-01-11 08:32:43 (GMT) |
| commit | 610e8140de8e8f0640ee75c793664ba6d0cc27fd (patch) | |
| tree | ccd864373968bb2e10239fc8966e709c584126ab /Doc/library | |
| parent | 9007f72db095212a169b3234194fcc08bd14bf6e (diff) | |
| parent | f4ec3c5a92faa671d15f80884c40a101495f20ae (diff) | |
| download | cpython-610e8140de8e8f0640ee75c793664ba6d0cc27fd.zip cpython-610e8140de8e8f0640ee75c793664ba6d0cc27fd.tar.gz cpython-610e8140de8e8f0640ee75c793664ba6d0cc27fd.tar.bz2 | |
Merge with 3.2
#13754 String returned if less than *or equal to* x 3
*13753 'seq' now 'iterable'
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/stdtypes.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 49222f5..253f41e 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1193,7 +1193,7 @@ functions based on regular expressions. 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 @@ functions based on regular expressions. 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 @@ functions based on regular expressions. 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 @@ functions based on regular expressions. 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)``. |