diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-11-23 20:54:09 +0000 |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-11-23 20:54:09 +0000 |
| commit | 9dd5e16c5d8e7d9e7fa9c2fb1b2754df8161ab2b (patch) | |
| tree | be26a88852bfbd0110960453ce7fa61b0ad6df00 /Objects | |
| parent | faa25999a32ed55a065c2deb4208049197029a0e (diff) | |
| download | cpython-git-9dd5e16c5d8e7d9e7fa9c2fb1b2754df8161ab2b.tar.gz | |
Issue #7117, continued: Remove substitution of %g-style formatting for
%f-style formatting, which used to occur at high precision. Float formatting
should now be consistent between 2.7 and 3.1.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/stringlib/formatter.h | 6 | ||||
| -rw-r--r-- | Objects/stringobject.c | 3 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 3 |
3 files changed, 0 insertions, 12 deletions
diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h index c722460472..f09578fa13 100644 --- a/Objects/stringlib/formatter.h +++ b/Objects/stringlib/formatter.h @@ -957,12 +957,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. */ diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 1d9ba8cd5b..6636b9af6d 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -4398,9 +4398,6 @@ formatfloat(PyObject *v, int flags, int prec, int type) if (prec < 0) prec = 6; - if (type == 'f' && fabs(x) >= 1e50) - type = 'g'; - p = PyOS_double_to_string(x, type, prec, (flags & F_ALT) ? Py_DTSF_ALT : 0, NULL); diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 401f7bea2d..2fa004eae1 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -8318,9 +8318,6 @@ formatfloat(PyObject *v, int flags, int prec, int type) if (prec < 0) prec = 6; - if (type == 'f' && fabs(x) >= 1e50) - type = 'g'; - p = PyOS_double_to_string(x, type, prec, (flags & F_ALT) ? Py_DTSF_ALT : 0, NULL); if (p == NULL) |