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.
........
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 @@
+------------+-----------------------------------------------------+-------+
| ``'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 @@
| ``'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 |