mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 65069 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65069 | eric.smith | 2008-07-17 13:48:39 -0400 (Thu, 17 Jul 2008) | 1 line

  Issue 3382: Make '%F' and float.__format__('F') convert results to upper case.
........
This commit is contained in:
Eric Smith 2008-07-17 18:30:48 +00:00
parent ddc5669fd9
commit a4fac36eb3
7 changed files with 44 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Objects/stringlib/formatter.h
View file

@ -741,10 +741,6 @@ format_float_internal(PyObject *value,
/* first, do the conversion as 8-bit chars, using the platform's
snprintf. then, if needed, convert to unicode. */
/* 'F' is the same as 'f', per the PEP */
if (type == 'F')
type = 'f';
x = PyFloat_AsDouble(value);
if (x == -1.0 && PyErr_Occurred())
@ -758,8 +754,12 @@ format_float_internal(PyObject *value,
if (precision < 0)
precision = 6;
if (type == 'f' && (fabs(x) / 1e25) >= 1e25)
type = 'g';
if ((type == 'f' || type == 'F') && (fabs(x) / 1e25) >= 1e25) {
if (type == 'f')
type = 'g';
else
type = 'G';
}
/* 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"