traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge with 3.2 

#13754 String returned if less than *or equal to* x 3
*13753 'seq' now 'iterable'
This commit is contained in:
Terry Jan Reedy 2012-01-11 03:32:43 -05:00
parent 9007f72db0 f4ec3c5a92
commit 610e8140de
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Doc/library/stdtypes.rst
View File

@ -1193,7 +1193,7 @@ functions based on regular expressions.
Return a string which is the concatenation of the strings in the Return a string which is the concatenation of the strings in the
:term:`iterable` *iterable*. A :exc:`TypeError` will be raised if there are :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. 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 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 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() .. 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 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 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) .. 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 Return the numeric string left filled with zeros in a string of length
*width*. A sign prefix is handled correctly. The original string is *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)``.