[Python-checkins] r65075 - in python/trunk: Doc/library/stdtypes.rst Doc/library/string.rst Lib/test/test_format.py Lib/test/test_types.py Misc/NEWS Objects/stringlib/formatter.h Objects/stringobject.c Objects/unicodeobject.c
eric.smith
python-checkins at python.org
Thu Jul 17 21:49:50 CEST 2008
Author: eric.smith
Date: Thu Jul 17 21:49:47 2008
New Revision: 65075
Log:
Backed out r65069, pending fixing it in Windows.
Modified:
python/trunk/Doc/library/stdtypes.rst
python/trunk/Doc/library/string.rst
python/trunk/Lib/test/test_format.py
python/trunk/Lib/test/test_types.py
python/trunk/Misc/NEWS
python/trunk/Objects/stringlib/formatter.h
python/trunk/Objects/stringobject.c
python/trunk/Objects/unicodeobject.c
Modified: python/trunk/Doc/library/stdtypes.rst
==============================================================================
--- python/trunk/Doc/library/stdtypes.rst (original)
+++ python/trunk/Doc/library/stdtypes.rst Thu Jul 17 21:49:47 2008
@@ -1296,9 +1296,9 @@
+------------+-----------------------------------------------------+-------+
| ``'E'`` | Floating point exponential format (uppercase). | \(3) |
+------------+-----------------------------------------------------+-------+
-| ``'f'`` | Floating point decimal format (lowercase). | \(3) |
+| ``'f'`` | Floating point decimal format. | \(3) |
+------------+-----------------------------------------------------+-------+
-| ``'F'`` | Floating point decimal format (uppercase). | \(3) |
+| ``'F'`` | Floating point decimal format. | \(3) |
+------------+-----------------------------------------------------+-------+
| ``'g'`` | Floating point format. Uses lowercase exponential | \(4) |
| | format if exponent is less than -4 or not less than | |
Modified: python/trunk/Doc/library/string.rst
==============================================================================
--- python/trunk/Doc/library/string.rst (original)
+++ python/trunk/Doc/library/string.rst Thu Jul 17 21:49:47 2008
@@ -429,14 +429,13 @@
| ``'e'`` | Exponent notation. Prints the number in scientific |
| | notation using the letter 'e' to indicate the exponent. |
+---------+----------------------------------------------------------+
- | ``'E'`` | Exponent notation. Same as ``'e'`` except it converts |
- | | the number to upper case. |
+ | ``'E'`` | Exponent notation. Same as ``'e'`` except it uses an |
+ | | upper case 'E' as the separator character. |
+---------+----------------------------------------------------------+
| ``'f'`` | Fixed point. Displays the number as a fixed-point |
| | number. |
+---------+----------------------------------------------------------+
- | ``'F'`` | Fixed point. Same as ``'f'`` except it converts the |
- | | number to upper case. |
+ | ``'F'`` | Fixed point. Same as ``'f'``. |
+---------+----------------------------------------------------------+
| ``'g'`` | General format. This prints the number as a fixed-point |
| | number, unless the number is too large, in which case |
Modified: python/trunk/Lib/test/test_format.py
==============================================================================
--- python/trunk/Lib/test/test_format.py (original)
+++ python/trunk/Lib/test/test_format.py Thu Jul 17 21:49:47 2008
@@ -88,18 +88,6 @@
testboth("%#.*F", (110, -1.e+100/3.))
overflowrequired = 0
- # check for %f and %F
- testboth("%f", (1.0,), "1.000000")
- testboth("%F", (1.0,), "1.000000")
- testboth("%f", (1e100,), "1e+100")
- testboth("%F", (1e100,), "1E+100")
- testboth("%f", (1e100,), "1e+100")
- testboth("%F", (1e100,), "1E+100")
- testboth("%f", (float('nan'),), "nan")
- testboth("%F", (float('nan'),), "NAN")
- testboth("%f", (float('inf'),), "inf")
- testboth("%F", (float('inf'),), "INF")
-
# Formatting of long integers. Overflow is not ok
overflowok = 0
testboth("%x", 10L, "a")
Modified: python/trunk/Lib/test/test_types.py
==============================================================================
--- python/trunk/Lib/test/test_types.py (original)
+++ python/trunk/Lib/test/test_types.py Thu Jul 17 21:49:47 2008
@@ -587,17 +587,9 @@
test( 1.0, '+f', '+1.000000')
test(-1.0, '+f', '-1.000000')
test(1.1234e90, 'f', '1.1234e+90')
- test(1.1234e90, 'F', '1.1234E+90')
+ test(1.1234e90, 'F', '1.1234e+90')
test(1.1234e200, 'f', '1.1234e+200')
- test(1.1234e200, 'F', '1.1234E+200')
- test(1e100, 'x<20f', '1e+100xxxxxxxxxxxxxx')
- test(1e100, 'x<20F', '1E+100xxxxxxxxxxxxxx')
- test(float('nan'), 'f', 'nan')
- test(float('nan'), 'F', 'NAN')
- test(float('inf'), 'f', 'inf')
- test(float('inf'), 'F', 'INF')
- test(float('-inf'), 'f', '-inf')
- test(float('-inf'), 'F', '-INF')
+ test(1.1234e200, 'F', '1.1234e+200')
test( 1.0, 'e', '1.000000e+00')
test(-1.0, 'e', '-1.000000e+00')
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS (original)
+++ python/trunk/Misc/NEWS Thu Jul 17 21:49:47 2008
@@ -10,9 +10,6 @@
Core and Builtins
-----------------
-- Issue #3382: Make '%F' and float.__format__('F') convert results
- to uppercase.
-
- Issue #3156: Fix inconsistent behavior of the bytearray type: all
its methods now allow for items objects that can be converted to
an integer using operator.index().
Modified: python/trunk/Objects/stringlib/formatter.h
==============================================================================
--- python/trunk/Objects/stringlib/formatter.h (original)
+++ python/trunk/Objects/stringlib/formatter.h Thu Jul 17 21:49:47 2008
@@ -741,6 +741,10 @@
/* 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())
@@ -754,12 +758,8 @@
if (precision < 0)
precision = 6;
- if ((type == 'f' || type == 'F') && (fabs(x) / 1e25) >= 1e25) {
- if (type == 'f')
- type = 'g';
- else
- type = 'G';
- }
+ if (type == 'f' && (fabs(x) / 1e25) >= 1e25)
+ 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"
Modified: python/trunk/Objects/stringobject.c
==============================================================================
--- python/trunk/Objects/stringobject.c (original)
+++ python/trunk/Objects/stringobject.c Thu Jul 17 21:49:47 2008
@@ -4320,12 +4320,8 @@
}
if (prec < 0)
prec = 6;
- if ((type == 'f' || type == 'F') && (fabs(x) / 1e25) >= 1e25) {
- if (type == 'f')
- type = 'g';
- else
- type = 'G';
- }
+ if (type == 'f' && fabs(x)/1e25 >= 1e25)
+ type = 'g';
/* Worst case length calc to ensure no buffer overrun:
'g' formats:
@@ -4344,8 +4340,7 @@
*/
if (((type == 'g' || type == 'G') &&
buflen <= (size_t)10 + (size_t)prec) ||
- ((type == 'f' || type == 'F') &&
- buflen <= (size_t)53 + (size_t)prec)) {
+ (type == 'f' && buflen <= (size_t)53 + (size_t)prec)) {
PyErr_SetString(PyExc_OverflowError,
"formatted float is too long (precision too large?)");
return -1;
@@ -4915,6 +4910,8 @@
case 'F':
case 'g':
case 'G':
+ if (c == 'F')
+ c = 'f';
pbuf = formatbuf;
len = formatfloat(pbuf, sizeof(formatbuf),
flags, prec, c, v);
Modified: python/trunk/Objects/unicodeobject.c
==============================================================================
--- python/trunk/Objects/unicodeobject.c (original)
+++ python/trunk/Objects/unicodeobject.c Thu Jul 17 21:49:47 2008
@@ -8191,12 +8191,8 @@
return -1;
if (prec < 0)
prec = 6;
- if ((type == 'f' || type == 'F') && (fabs(x) / 1e25) >= 1e25) {
- if (type == 'f')
- type = 'g';
- else
- type = 'G';
- }
+ if (type == 'f' && (fabs(x) / 1e25) >= 1e25)
+ type = 'g';
/* Worst case length calc to ensure no buffer overrun:
'g' formats:
@@ -8215,8 +8211,7 @@
*/
if (((type == 'g' || type == 'G') &&
buflen <= (size_t)10 + (size_t)prec) ||
- ((type == 'f' || type == 'F') &&
- buflen <= (size_t)53 + (size_t)prec)) {
+ (type == 'f' && buflen <= (size_t)53 + (size_t)prec)) {
PyErr_SetString(PyExc_OverflowError,
"formatted float is too long (precision too large?)");
return -1;
@@ -8709,6 +8704,8 @@
case 'F':
case 'g':
case 'G':
+ if (c == 'F')
+ c = 'f';
pbuf = formatbuf;
len = formatfloat(pbuf, sizeof(formatbuf)/sizeof(Py_UNICODE),
flags, prec, c, v);
More information about the Python-checkins
mailing list