mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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

11
Lib/test/test_format.py
View file

@ -79,6 +79,17 @@ 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")

12
Lib/test/test_types.py
View file

@ -514,9 +514,17 @@ 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(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.0, 'e', '1.000000e+00')
test(-1.0, 'e', '-1.000000e+00')