diff options
| author | Eric Smith <eric@trueblade.com> | 2008-07-17 19:18:29 (GMT) |
|---|---|---|
| committer | Eric Smith <eric@trueblade.com> | 2008-07-17 19:18:29 (GMT) |
| commit | 22b85b3ef85c50ce5053acb2860df858d040eb07 (patch) | |
| tree | ab07c2d9efb0168302d489bd8489894ef0c38c06 /Lib | |
| parent | a4fac36eb3ee70529482d43d2a484d5ff5d18398 (diff) | |
| download | cpython-22b85b3ef85c50ce5053acb2860df858d040eb07.zip cpython-22b85b3ef85c50ce5053acb2860df858d040eb07.tar.gz cpython-22b85b3ef85c50ce5053acb2860df858d040eb07.tar.bz2 | |
Backed out r65073, pending fixing it in Windows.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_format.py | 11 | ||||
| -rw-r--r-- | Lib/test/test_types.py | 12 |
2 files changed, 2 insertions, 21 deletions
diff --git a/Lib/test/test_format.py b/Lib/test/test_format.py index 30b07d8..6d32e86 100644 --- a/Lib/test/test_format.py +++ b/Lib/test/test_format.py @@ -79,17 +79,6 @@ class FormatTest(unittest.TestCase): testformat("%#.*f", (110, -1.e+100/3.)) testformat("%#.*F", (110, -1.e+100/3.)) overflowrequired = 0 - # check for %f and %F - testformat("%f", (1.0,), "1.000000") - testformat("%F", (1.0,), "1.000000") - testformat("%f", (1e100,), "1e+100") - testformat("%F", (1e100,), "1E+100") - testformat("%f", (1e100,), "1e+100") - testformat("%F", (1e100,), "1E+100") - testformat("%f", (float('nan'),), "nan") - testformat("%F", (float('nan'),), "NAN") - testformat("%f", (float('inf'),), "inf") - testformat("%F", (float('inf'),), "INF") # Formatting of integers. Overflow is not ok overflowok = 0 testformat("%x", 10, "a") diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py index 4db1184..1b8e605 100644 --- a/Lib/test/test_types.py +++ b/Lib/test/test_types.py @@ -514,17 +514,9 @@ class TypesTests(unittest.TestCase): 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') |