Keep py3k and trunk code in sync.

27f204dc · Eric Smith · 24cc78ac · 27f204dc
Commit 27f204dc authored May 02, 2009 by Eric Smith
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

Objects/stringlib/formatter.h Objects/stringlib/formatter.h +4 -0

No files found.
--- 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"