diff options
| author | Eric Smith <eric@trueblade.com> | 2008-07-17 17:48:39 +0000 |
|---|---|---|
| committer | Eric Smith <eric@trueblade.com> | 2008-07-17 17:48:39 +0000 |
| commit | 7d77d6ca68dbb9f9a772be7eff3ff3693fa7f300 (patch) | |
| tree | ffaca79d1c1615a46752571ae18cab41b626abd8 /Objects/stringlib/formatter.h | |
| parent | cc181cd5a3b03b8f54302c262cebfabbfc4da260 (diff) | |
| download | cpython-7d77d6ca68dbb9f9a772be7eff3ff3693fa7f300.tar.gz | |
Issue 3382: Make '%F' and float.__format__('F') convert results to upper case.
Diffstat (limited to 'Objects/stringlib/formatter.h')
| -rw-r--r-- | Objects/stringlib/formatter.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h index b964435745..d8cb1715c4 100644 --- a/Objects/stringlib/formatter.h +++ b/Objects/stringlib/formatter.h @@ -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" |