Issue 3382: Make '%F' and float.__format__('F') convert results to upper case.
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 793cc88..b161c8c 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -4320,8 +4320,12 @@
}
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:
@@ -4340,7 +4344,8 @@
*/
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;
@@ -4910,8 +4915,6 @@
case 'F':
case 'g':
case 'G':
- if (c == 'F')
- c = 'f';
pbuf = formatbuf;
len = formatfloat(pbuf, sizeof(formatbuf),
flags, prec, c, v);