From: Eric Smith <eric@trueblade.com>
Date: Mon, 27 Jul 2009 01:58:25 +0000 (+0000)
Subject: Sync trunk and py3k versions of string formatting. Will manually merge into py3k.
X-Git-Tag: v2.7a1~705
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e94a8263044827a944e211e53339d1f92d7e0cae;p=python

Sync trunk and py3k versions of string formatting. Will manually merge into py3k.
---

diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h
index 3b2218128d..5cead660c4 100644
--- a/Objects/stringlib/formatter.h
+++ b/Objects/stringlib/formatter.h
@@ -920,9 +920,12 @@ format_float_internal(PyObject *value,
            format the result. We take care of that later. */
         type = 'g';
 
+#if PY_VERSION_HEX < 0x0301000
     /* 'F' is the same as 'f', per the PEP */
+    /* This is no longer the case in 3.x */
     if (type == 'F')
         type = 'f';
+#endif
 
     val = PyFloat_AsDouble(value);
     if (val == -1.0 && PyErr_Occurred())
@@ -1114,9 +1117,12 @@ format_complex_internal(PyObject *value,
            format the result. We take care of that later. */
         type = 'g';
 
+#if PY_VERSION_HEX < 0x03010000
+    /* This is no longer the case in 3.x */
     /* 'F' is the same as 'f', per the PEP */
     if (type == 'F')
         type = 'f';
+#endif
 
     if (precision < 0)
         precision = default_precision;