Backed out r65069, pending fixing it in Windows.
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index b161c8c..793cc88 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -4320,12 +4320,8 @@
}
if (prec < 0)
prec = 6;
- if ((type == 'f' || type == 'F') && (fabs(x) / 1e25) >= 1e25) {
- if (type == 'f')
- type = 'g';
- else
- type = 'G';
- }
+ if (type == 'f' && fabs(x)/1e25 >= 1e25)
+ type = 'g';
/* Worst case length calc to ensure no buffer overrun:
'g' formats:
@@ -4344,8 +4340,7 @@
*/
if (((type == 'g' || type == 'G') &&
buflen <= (size_t)10 + (size_t)prec) ||
- ((type == 'f' || type == 'F') &&
- buflen <= (size_t)53 + (size_t)prec)) {
+ (type == 'f' && buflen <= (size_t)53 + (size_t)prec)) {
PyErr_SetString(PyExc_OverflowError,
"formatted float is too long (precision too large?)");
return -1;
@@ -4915,6 +4910,8 @@
case 'F':
case 'g':
case 'G':
+ if (c == 'F')
+ c = 'f';
pbuf = formatbuf;
len = formatfloat(pbuf, sizeof(formatbuf),
flags, prec, c, v);