diff options
| author | Eric Smith <eric@trueblade.com> | 2009-07-27 01:58:25 (GMT) |
|---|---|---|
| committer | Eric Smith <eric@trueblade.com> | 2009-07-27 01:58:25 (GMT) |
| commit | e94a8263044827a944e211e53339d1f92d7e0cae (patch) | |
| tree | 9906c056e74aaa75dbf1897901714ffbb087c5ac /Objects | |
| parent | fb0e0570f7ad0c5a02ee6dbfc83b37fd10a65de7 (diff) | |
| download | cpython-e94a8263044827a944e211e53339d1f92d7e0cae.zip cpython-e94a8263044827a944e211e53339d1f92d7e0cae.tar.gz cpython-e94a8263044827a944e211e53339d1f92d7e0cae.tar.bz2 | |
Sync trunk and py3k versions of string formatting. Will manually merge into py3k.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/stringlib/formatter.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h index 3b22181..5cead66 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; |