Issue #3382: Make '%F' and float.__format__('F') convert results to upper case. Much of the patch came from Mark Dickinson.
diff --git a/Lib/test/formatfloat_testcases.txt b/Lib/test/formatfloat_testcases.txt
index 4cf20aa..43ef040 100644
--- a/Lib/test/formatfloat_testcases.txt
+++ b/Lib/test/formatfloat_testcases.txt
@@ -81,6 +81,14 @@
%f 0.0000005001 -> 0.000001
%f 0.0000004999 -> 0.000000
+-- nans and infinities
+%f nan -> nan
+%f inf -> inf
+%f -infinity -> -inf
+%F nan -> NAN
+%F infinity -> INF
+%F -inf -> -INF
+
-- 'e' code formatting with explicit precision (>= 0). Output should
-- always have exactly the number of places after the point that were
-- requested.
@@ -202,6 +210,14 @@
%#.1e 123.4 -> 1.2e+02
%#.2e 0.0001357 -> 1.36e-04
+-- nans and infinities
+%e nan -> nan
+%e inf -> inf
+%e -infinity -> -inf
+%E nan -> NAN
+%E infinity -> INF
+%E -inf -> -INF
+
-- 'g' code formatting.
-- zeros
@@ -314,6 +330,14 @@
%#.5g 234.56 -> 234.56
%#.6g 234.56 -> 234.560
+-- nans and infinities
+%g nan -> nan
+%g inf -> inf
+%g -infinity -> -inf
+%G nan -> NAN
+%G infinity -> INF
+%G -inf -> -INF
+
-- for repr formatting see the separate test_short_repr test in
-- test_float.py. Not all platforms use short repr for floats.
diff --git a/Lib/test/test_complex.py b/Lib/test/test_complex.py
index a192ec4..a2f4ed5 100644
--- a/Lib/test/test_complex.py
+++ b/Lib/test/test_complex.py
@@ -539,6 +539,25 @@
# make sure everything works in ''.format()
self.assertEqual('*{0:.3f}*'.format(3.14159+2.71828j), '*3.142+2.718j*')
+ # issue 3382: 'f' and 'F' with inf's and nan's
+ self.assertEqual('{0:f}'.format(INF+0j), 'inf+0.000000j')
+ self.assertEqual('{0:F}'.format(INF+0j), 'INF+0.000000j')
+ self.assertEqual('{0:f}'.format(-INF+0j), '-inf+0.000000j')
+ self.assertEqual('{0:F}'.format(-INF+0j), '-INF+0.000000j')
+ self.assertEqual('{0:f}'.format(complex(INF, INF)), 'inf+infj')
+ self.assertEqual('{0:F}'.format(complex(INF, INF)), 'INF+INFj')
+ self.assertEqual('{0:f}'.format(complex(INF, -INF)), 'inf-infj')
+ self.assertEqual('{0:F}'.format(complex(INF, -INF)), 'INF-INFj')
+ self.assertEqual('{0:f}'.format(complex(-INF, INF)), '-inf+infj')
+ self.assertEqual('{0:F}'.format(complex(-INF, INF)), '-INF+INFj')
+ self.assertEqual('{0:f}'.format(complex(-INF, -INF)), '-inf-infj')
+ self.assertEqual('{0:F}'.format(complex(-INF, -INF)), '-INF-INFj')
+
+ self.assertEqual('{0:f}'.format(complex(NAN, 0)), 'nan+0.000000j')
+ self.assertEqual('{0:F}'.format(complex(NAN, 0)), 'NAN+0.000000j')
+ self.assertEqual('{0:f}'.format(complex(NAN, NAN)), 'nan+nanj')
+ self.assertEqual('{0:F}'.format(complex(NAN, NAN)), 'NAN+NANj')
+
def test_main():
test_support.run_unittest(ComplexTest)
diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py
index 4e918fb..3ad1402 100644
--- a/Lib/test/test_float.py
+++ b/Lib/test/test_float.py
@@ -309,6 +309,14 @@
self.assertRaises(ValueError, format, 1e-100, format_spec)
self.assertRaises(ValueError, format, -1e-100, format_spec)
+ # issue 3382: 'f' and 'F' with inf's and nan's
+ self.assertEqual('{0:f}'.format(INF), 'inf')
+ self.assertEqual('{0:F}'.format(INF), 'INF')
+ self.assertEqual('{0:f}'.format(-INF), '-inf')
+ self.assertEqual('{0:F}'.format(-INF), '-INF')
+ self.assertEqual('{0:f}'.format(NAN), 'nan')
+ self.assertEqual('{0:F}'.format(NAN), 'NAN')
+
@unittest.skipUnless(float.__getformat__("double").startswith("IEEE"),
"test requires IEEE 754 doubles")
def test_format_testfile(self):
@@ -321,8 +329,10 @@
lhs, rhs = map(str.strip, line.split('->'))
fmt, arg = lhs.split()
- self.assertEqual(fmt % float(arg), rhs)
- self.assertEqual(fmt % -float(arg), '-' + rhs)
+ arg = float(arg)
+ self.assertEqual(fmt % arg, rhs)
+ if not math.isnan(arg) and copysign(1.0, arg) > 0.0:
+ self.assertEqual(fmt % -arg, '-' + rhs)
def test_issue5864(self):
self.assertEquals(format(123.456, '.4'), '123.5')