diff options
| author | Eric Smith <eric@trueblade.com> | 2008-07-17 18:30:48 (GMT) |
|---|---|---|
| committer | Eric Smith <eric@trueblade.com> | 2008-07-17 18:30:48 (GMT) |
| commit | a4fac36eb3ee70529482d43d2a484d5ff5d18398 (patch) | |
| tree | f28ae6605017ff42d83cdf78978391b4c7237079 /Doc/library | |
| parent | ddc5669fd90135ba345a9f1a98a11c67a97f833e (diff) | |
| download | cpython-a4fac36eb3ee70529482d43d2a484d5ff5d18398.zip cpython-a4fac36eb3ee70529482d43d2a484d5ff5d18398.tar.gz cpython-a4fac36eb3ee70529482d43d2a484d5ff5d18398.tar.bz2 | |
Merged revisions 65069 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65069 | eric.smith | 2008-07-17 13:48:39 -0400 (Thu, 17 Jul 2008) | 1 line
Issue 3382: Make '%F' and float.__format__('F') convert results to upper case.
........
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/stdtypes.rst | 4 | ||||
| -rw-r--r-- | Doc/library/string.rst | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 47bf42c..5a20969 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1223,9 +1223,9 @@ The conversion types are: +------------+-----------------------------------------------------+-------+ | ``'E'`` | Floating point exponential format (uppercase). | \(3) | +------------+-----------------------------------------------------+-------+ -| ``'f'`` | Floating point decimal format. | \(3) | +| ``'f'`` | Floating point decimal format (lowercase). | \(3) | +------------+-----------------------------------------------------+-------+ -| ``'F'`` | Floating point decimal format. | \(3) | +| ``'F'`` | Floating point decimal format (uppercase). | \(3) | +------------+-----------------------------------------------------+-------+ | ``'g'`` | Floating point format. Uses lowercase exponential | \(4) | | | format if exponent is less than -4 or not less than | | diff --git a/Doc/library/string.rst b/Doc/library/string.rst index 07a2c4b..1946979 100644 --- a/Doc/library/string.rst +++ b/Doc/library/string.rst @@ -402,13 +402,14 @@ The available presentation types for floating point and decimal values are: | ``'e'`` | Exponent notation. Prints the number in scientific | | | notation using the letter 'e' to indicate the exponent. | +---------+----------------------------------------------------------+ - | ``'E'`` | Exponent notation. Same as ``'e'`` except it uses an | - | | upper case 'E' as the separator character. | + | ``'E'`` | Exponent notation. Same as ``'e'`` except it converts | + | | the number to upper case. | +---------+----------------------------------------------------------+ | ``'f'`` | Fixed point. Displays the number as a fixed-point | | | number. | +---------+----------------------------------------------------------+ - | ``'F'`` | Fixed point. Same as ``'f'``. | + | ``'F'`` | Fixed point. Same as ``'f'`` except it converts the | + | | number to upper case. | +---------+----------------------------------------------------------+ | ``'g'`` | General format. This prints the number as a fixed-point | | | number, unless the number is too large, in which case | |