Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Eric Smith 2009-07-27 01:58:25 +00:00
parent fb0e0570f7
commit e94a826304
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Objects/stringlib/formatter.h
View File

@ -920,9 +920,12 @@ format_float_internal(PyObject *value,
format the result. We take care of that later. */ format the result. We take care of that later. */
type = 'g'; type = 'g';
#if PY_VERSION_HEX < 0x0301000
/* 'F' is the same as 'f', per the PEP */ /* 'F' is the same as 'f', per the PEP */
/* This is no longer the case in 3.x */
if (type == 'F') if (type == 'F')
type = 'f'; type = 'f';
#endif
val = PyFloat_AsDouble(value); val = PyFloat_AsDouble(value);
if (val == -1.0 && PyErr_Occurred()) if (val == -1.0 && PyErr_Occurred())
@ -1114,9 +1117,12 @@ format_complex_internal(PyObject *value,
format the result. We take care of that later. */ format the result. We take care of that later. */
type = 'g'; 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 */ /* 'F' is the same as 'f', per the PEP */
if (type == 'F') if (type == 'F')
type = 'f'; type = 'f';
#endif
if (precision < 0) if (precision < 0)
precision = default_precision; precision = default_precision;