mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #3382. float 'F' formatting no longer maps to 'f'. This only affects nan and inf.

Browse source
This commit is contained in:
Eric Smith 2009-05-06 13:08:15 +00:00
parent 5776c1623c
commit 741191f17a
6 changed files with 48 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Objects/stringlib/formatter.h
View file

@ -920,10 +920,6 @@ format_float_internal(PyObject *value,
format the result. We take care of that later. */
type = 'g';
/* 'F' is the same as 'f', per the PEP */
if (type == 'F')
type = 'f';
val = PyFloat_AsDouble(value);
if (val == -1.0 && PyErr_Occurred())
goto done;
@ -939,8 +935,15 @@ format_float_internal(PyObject *value,
#if PY_VERSION_HEX < 0x03010000
/* 3.1 no longer converts large 'f' to 'g'. */
if ((type == 'f' || type == 'F') && fabs(val) >= 1e50)
type = 'g';
if (fabs(val) >= 1e50)
switch (type) {
case 'f':
type = 'g';
break;
case 'F':
type = 'G';
break;
}
#endif
/* Cast "type", because if we're in unicode we need to pass a
@ -1114,10 +1117,6 @@ format_complex_internal(PyObject *value,
format the result. We take care of that later. */
type = 'g';
/* 'F' is the same as 'f', per the PEP */
if (type == 'F')
type = 'f';
if (precision < 0)
precision = default_precision;