summaryrefslogtreecommitdiffstats
path: root/Objects/stringlib
diff options
context:
space:
mode:
authorEric Smith <eric@trueblade.com>2009-11-29 17:56:54 (GMT)
committerEric Smith <eric@trueblade.com>2009-11-29 17:56:54 (GMT)
commitc50e05ea9acbc10e86da3f861662e197f36f0cd9 (patch)
treec4421eb3ad19c9e879f66e0179020f20e4ffe7eb /Objects/stringlib
parent379992215b94e8b636b9a83562830e3a8287f493 (diff)
downloadcpython-c50e05ea9acbc10e86da3f861662e197f36f0cd9.zip
cpython-c50e05ea9acbc10e86da3f861662e197f36f0cd9.tar.gz
cpython-c50e05ea9acbc10e86da3f861662e197f36f0cd9.tar.bz2
Keep this file in sync with trunk.
Diffstat (limited to 'Objects/stringlib')
-rw-r--r--Objects/stringlib/formatter.h20
1 files changed, 0 insertions, 20 deletions
diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h
index c722460..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;
@@ -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;