[Python-checkins] r72192 - in python/branches/py3k: Objects/stringlib/formatter.h

[eric.smith]

Author: eric.smith
Date: Sat May  2 14:15:39 2009
New Revision: 72192

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Objects/stringlib/formatter.h

Modified: python/branches/py3k/Objects/stringlib/formatter.h
==============================================================================
--- python/branches/py3k/Objects/stringlib/formatter.h	(original)
+++ python/branches/py3k/Objects/stringlib/formatter.h	Sat May  2 14:15:39 2009
@@ -935,6 +935,12 @@
     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. */