merge with 3.5

This commit is contained in:
Georg Brandl 2016-02-22 14:53:03 +01:00
commit 2d43bc2fc2

View file

@ -153,11 +153,11 @@ Positional and keyword arguments can be arbitrarily combined::
``'!a'`` (apply :func:`ascii`), ``'!s'`` (apply :func:`str`) and ``'!r'`` ``'!a'`` (apply :func:`ascii`), ``'!s'`` (apply :func:`str`) and ``'!r'``
(apply :func:`repr`) can be used to convert the value before it is formatted:: (apply :func:`repr`) can be used to convert the value before it is formatted::
>>> import math >>> contents = 'eels'
>>> print('The value of PI is approximately {}.'.format(math.pi)) >>> print('My hovercraft is full of {}.'.format(contents))
The value of PI is approximately 3.14159265359. My hovercraft is full of eels.
>>> print('The value of PI is approximately {!r}.'.format(math.pi)) >>> print('My hovercraft is full of {!r}.'.format(contents))
The value of PI is approximately 3.141592653589793. My hovercraft is full of 'eels'.
An optional ``':'`` and format specifier can follow the field name. This allows An optional ``':'`` and format specifier can follow the field name. This allows
greater control over how the value is formatted. The following example greater control over how the value is formatted. The following example