From 7255f18556ae70fc28b563a345577d3ec8f6f0ba Mon Sep 17 00:00:00 2001 From: Eric Smith Date: Sat, 2 May 2009 12:15:39 +0000 Subject: Merged revisions 72189 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72189 | eric.smith | 2009-05-02 05:58:09 -0400 (Sat, 02 May 2009) | 1 line Keep py3k and trunk code in sync. ........ --- Objects/stringlib/formatter.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h index d9d47b9..1f3c535 100644 --- a/Objects/stringlib/formatter.h +++ b/Objects/stringlib/formatter.h @@ -935,6 +935,12 @@ format_float_internal(PyObject *value, if (precision < 0) precision = 6; +#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. */ -- cgit v0.12