Issue #15544: Fix Decimal.__float__ to work with payload-carrying NaNs.

diff --git a/Lib/decimal.py b/Lib/decimal.py
index f5277c597cabf854a82fd1e3afd236b5eac200ef..49de53592fc725d5714829ac336319cf863e60e6 100644 (file)
--- a/Lib/decimal.py
+++ b/Lib/decimal.py
@@ -1555,7 +1555,13 @@ class Decimal(object):
 
     def __float__(self):
         """Float representation."""
-        return float(str(self))
+        if self._isnan():
+            if self.is_snan():
+                raise ValueError("Cannot convert signaling NaN to float")
+            s = "-nan" if self._sign else "nan"
+        else:
+            s = str(self)
+        return float(s)
 
     def __int__(self):
         """Converts self to an int, truncating if necessary."""

diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
index e46cd91e5e325fd9e1a3779bc719bfc7f35db9b9..3ff855fc1ccca35075ae79ed02c9e76cf5519ca9 100644 (file)
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -1518,6 +1518,22 @@ class DecimalUsabilityTest(unittest.TestCase):
 
 
 
+    def test_nan_to_float(self):
+        # Test conversions of decimal NANs to float.
+        # See http://bugs.python.org/issue15544
+        Decimal = self.decimal.Decimal
+        for s in ('nan', 'nan1234', '-nan', '-nan2468'):
+            f = float(Decimal(s))
+            self.assertTrue(math.isnan(f))
+            sign = math.copysign(1.0, f)
+            self.assertEqual(sign, -1.0 if s.startswith('-') else 1.0)
+
+    def test_snan_to_float(self):
+        Decimal = self.decimal.Decimal
+        for s in ('snan', '-snan', 'snan1357', '-snan1234'):
+            d = Decimal(s)
+            self.assertRaises(ValueError, float, d)
+
     def test_eval_round_trip(self):
 
         #with zero

diff --git a/Misc/NEWS b/Misc/NEWS
index 19934d97b2c2cafb65afe7926d25b3ebf19a7902..508a832e81f4929f980fae4eeb8ea1460c36b4a7 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -109,6 +109,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #15544: Fix Decimal.__float__ to work with payload-carrying NaNs.
+
 - Issue #15249: BytesGenerator now correctly mangles From lines (when
   requested) even if the body contains undecodable bytes.