mirror of https://github.com/python/cpython
Keep this file in sync with trunk.
This commit is contained in:
parent
379992215b
commit
c50e05ea9a
|
@ -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;
|
||||
|
@ -957,12 +950,6 @@ format_float_internal(PyObject *value,
|
|||
if (precision < 0)
|
||||
precision = default_precision;
|
||||
|
||||
#if PY_VERSION_HEX < 0x03010000
|
||||
/* 3.1 no longer converts large 'f' to 'g'. */
|
||||
if ((type == 'f' || type == 'F') && fabs(val) >= 1e50)
|
||||
type = 'g';
|
||||
#endif
|
||||
|
||||
/* 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"
|
||||
can be. */
|
||||
|
@ -1134,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;
|
||||
|
||||
|
|
Loading…
Reference in New Issue