summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Smith <eric@trueblade.com>2009-05-02 09:58:09 (GMT)
committerEric Smith <eric@trueblade.com>2009-05-02 09:58:09 (GMT)
commit27f204dc297945378f72536e63936bf3bb995fdf (patch)
treea687dd7df45e2067ecb523760990b79c8a60e160
parent24cc78ac61e49dbb6cfc2352d82aaaf7d56f1f43 (diff)
downloadcpython-27f204dc297945378f72536e63936bf3bb995fdf.zip
cpython-27f204dc297945378f72536e63936bf3bb995fdf.tar.gz
cpython-27f204dc297945378f72536e63936bf3bb995fdf.tar.bz2
Keep py3k and trunk code in sync.
-rw-r--r--Objects/stringlib/formatter.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h
index c5cda4c..1f3c535 100644
--- a/Objects/stringlib/formatter.h
+++ b/Objects/stringlib/formatter.h
@@ -934,8 +934,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"