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 47bf42c73a718e82c5c330117254036da8d8c863..5a209698c3ad99c415c09c9b633c31655f8cedcf 100644 (file)
--- 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 07a2c4b6f2b14e58eff67064926e055bac571e8e..1946979ea085ab2cd74a07c7a802c682b6cbd742 100644 (file)
--- 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    |

diff --git a/Lib/test/test_format.py b/Lib/test/test_format.py
index 6d32e86513a6f987d70aff715182b1f98247bad9..30b07d8fd56876c356b27283a850d25971833403 100644 (file)
--- a/Lib/test/test_format.py
+++ b/Lib/test/test_format.py
@@ -79,6 +79,17 @@ class FormatTest(unittest.TestCase):
         testformat("%#.*f", (110, -1.e+100/3.))
         testformat("%#.*F", (110, -1.e+100/3.))
         overflowrequired = 0
+        # check for %f and %F
+        testformat("%f", (1.0,), "1.000000")
+        testformat("%F", (1.0,), "1.000000")
+        testformat("%f", (1e100,), "1e+100")
+        testformat("%F", (1e100,), "1E+100")
+        testformat("%f", (1e100,), "1e+100")
+        testformat("%F", (1e100,), "1E+100")
+        testformat("%f", (float('nan'),), "nan")
+        testformat("%F", (float('nan'),), "NAN")
+        testformat("%f", (float('inf'),), "inf")
+        testformat("%F", (float('inf'),), "INF")
         # Formatting of integers. Overflow is not ok
         overflowok = 0
         testformat("%x", 10, "a")

diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
index 1b8e6054d7f5a8a45efe2aeea55fb639d3670308..4db118497d2509e57230fed1730a591c9e6db267 100644 (file)
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -514,9 +514,17 @@ class TypesTests(unittest.TestCase):
         test( 1.0, '+f', '+1.000000')
         test(-1.0, '+f', '-1.000000')
         test(1.1234e90, 'f', '1.1234e+90')
-        test(1.1234e90, 'F', '1.1234e+90')
+        test(1.1234e90, 'F', '1.1234E+90')
         test(1.1234e200, 'f', '1.1234e+200')
-        test(1.1234e200, 'F', '1.1234e+200')
+        test(1.1234e200, 'F', '1.1234E+200')
+        test(1e100, 'x<20f', '1e+100xxxxxxxxxxxxxx')
+        test(1e100, 'x<20F', '1E+100xxxxxxxxxxxxxx')
+        test(float('nan'), 'f', 'nan')
+        test(float('nan'), 'F', 'NAN')
+        test(float('inf'), 'f', 'inf')
+        test(float('inf'), 'F', 'INF')
+        test(float('-inf'), 'f', '-inf')
+        test(float('-inf'), 'F', '-INF')
 
         test( 1.0, 'e', '1.000000e+00')
         test(-1.0, 'e', '-1.000000e+00')

diff --git a/Misc/NEWS b/Misc/NEWS
index 56289407f6309b4e8d4ae25c7e347dc5c8d5bcf9..232d5c399762b4411de9fab07e163fbd98b24f7d 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's new in Python 3.0b2?
 Core and Builtins
 -----------------
 
+- Issue #3382: Make '%F' and float.__format__('F') convert results
+  to uppercase.
+
 - Issue #3008: the float type has a new instance method 'float.hex'
   and a new class method 'float.fromhex' to convert floating-point
   numbers to and from hexadecimal strings, respectively.

diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h
index b96443574594c2ec965f46b89caee4eb8b0ebcea..d8cb1715c4ebb541af165c69383ac60f389a5861 100644 (file)
--- a/Objects/stringlib/formatter.h
+++ b/Objects/stringlib/formatter.h
@@ -741,10 +741,6 @@ format_float_internal(PyObject *value,
     /* first, do the conversion as 8-bit chars, using the platform's
        snprintf.  then, if needed, convert to unicode. */
 
-    /* 'F' is the same as 'f', per the PEP */
-    if (type == 'F')
-        type = 'f';
-
     x = PyFloat_AsDouble(value);
 
     if (x == -1.0 && PyErr_Occurred())
@@ -758,8 +754,12 @@ format_float_internal(PyObject *value,
 
     if (precision < 0)
         precision = 6;
-    if (type == 'f' && (fabs(x) / 1e25) >= 1e25)
-        type = 'g';
+    if ((type == 'f' || type == 'F') && (fabs(x) / 1e25) >= 1e25) {
+       if (type == 'f')
+           type = 'g';
+       else
+           type = 'G';
+    }
 
     /* cast "type", because if we're in unicode we need to pass a
        8-bit char.  this is safe, because we've restricted what "type"

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index b0b525ae893d072c1c18df2bdac8704764733349..85d838cf3b9fa9bb19894aa320677197bb4f5374 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -8588,8 +8588,12 @@ formatfloat(Py_UNICODE *buf,
        return -1;
     if (prec < 0)
        prec = 6;
-    if (type == 'f' && (fabs(x) / 1e25) >= 1e25)
-       type = 'g';
+    if ((type == 'f' || type == 'F') && (fabs(x) / 1e25) >= 1e25) {
+        if (type == 'f')
+            type = 'g';
+        else
+            type = 'G';
+    }
     /* Worst case length calc to ensure no buffer overrun:
 
        'g' formats:
@@ -8608,7 +8612,8 @@ formatfloat(Py_UNICODE *buf,
     */
     if (((type == 'g' || type == 'G') && 
           buflen <= (size_t)10 + (size_t)prec) ||
-       (type == 'f' && buflen <= (size_t)53 + (size_t)prec)) {
+       ((type == 'f' || type == 'F')  &&
+          buflen <= (size_t)53 + (size_t)prec)) {
        PyErr_SetString(PyExc_OverflowError,
                        "formatted float is too long (precision too large?)");
        return -1;
@@ -9091,8 +9096,6 @@ PyObject *PyUnicode_Format(PyObject *format,
            case 'F':
            case 'g':
            case 'G':
-               if (c == 'F')
-                       c = 'f';
                pbuf = formatbuf;
                len = formatfloat(pbuf, sizeof(formatbuf)/sizeof(Py_UNICODE),
                        flags, prec, c, v);