Issue #3382: Make '%F' and float.__format__('F') convert results to upper case. Much of the patch came from Mark Dickinson.

3 files changed, 0 insertions, 18 deletions

diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h
index f09578f..f4a3ea3 100644
--- a/Objects/stringlib/formatter.h
+++ b/Objects/stringlib/formatter.h
@@ -937,13 +937,6 @@ format_float_internal(PyObject *value,
            format the result. We take care of that later. */
         type = 'g';
 
-#if PY_VERSION_HEX < 0x0301000
-    /* 'F' is the same as 'f', per the PEP */
-    /* This is no longer the case in 3.x */
-    if (type == 'F')
-        type = 'f';
-#endif
-
     val = PyFloat_AsDouble(value);
     if (val == -1.0 && PyErr_Occurred())
         goto done;
@@ -1128,13 +1121,6 @@ format_complex_internal(PyObject *value,
            format the result. We take care of that later. */
         type = 'g';
 
-#if PY_VERSION_HEX < 0x03010000
-    /* This is no longer the case in 3.x */
-    /* 'F' is the same as 'f', per the PEP */
-    if (type == 'F')
-        type = 'f';
-#endif
-
     if (precision < 0)
         precision = default_precision;
 
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 6636b9a..02aabf2 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -4966,8 +4966,6 @@ PyString_Format(PyObject *format, PyObject *args)
 			case 'F':
 			case 'g':
 			case 'G':
-				if (c == 'F')
-					c = 'f';
 				temp = formatfloat(v, flags, prec, c);
 				if (temp == NULL)
 					goto error;
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 2fa004e..e85b20f 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -8809,8 +8809,6 @@ PyObject *PyUnicode_Format(PyObject *format,
             case 'F':
             case 'g':
             case 'G':
-                if (c == 'F')
-                    c = 'f';
                 temp = formatfloat(v, flags, prec, c);
                 if (temp == NULL)
                     goto onError;