Merge

1 files changed, 7 insertions, 1 deletions

diff --git a/Lib/decimal.py b/Lib/decimal.py
index 6bd655bdb7..b74ab0134d 100644
--- a/Lib/decimal.py
+++ b/Lib/decimal.py
@@ -1601,7 +1601,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."""