[Jython-checkins] jython: Patch decimal.py with latest from 2.7.

[frank.wierzbicki]

http://hg.python.org/jython/rev/76bddc8d8265
changeset:   7078:76bddc8d8265
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Sun Mar 10 17:01:34 2013 -0700
summary:
  Patch decimal.py with latest from 2.7.

files:
  Lib/decimal.py           |   8 +++++++-
  Lib/test/test_decimal.py |  12 ++++++++++++
  2 files changed, 19 insertions(+), 1 deletions(-)


diff --git a/Lib/decimal.py b/Lib/decimal.py
--- a/Lib/decimal.py
+++ b/Lib/decimal.py
@@ -1580,7 +1580,13 @@
 
     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
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -1449,6 +1449,18 @@
         self.assertEqual(float(d1), 66)
         self.assertEqual(float(d2), 15.32)
 
+    def test_nan_to_float(self):
+        # Test conversions of decimal NANs to float.
+        # See http://bugs.python.org/issue15544
+        for s in ('nan', 'nan1234', '-nan', '-nan2468'):
+            f = float(Decimal(s))
+            self.assertTrue(math.isnan(f))
+
+    def test_snan_to_float(self):
+        for s in ('snan', '-snan', 'snan1357', '-snan1234'):
+            d = Decimal(s)
+            self.assertRaises(ValueError, float, d)
+
     def test_eval_round_trip(self):
 
         #with zero

-- 
Repository URL: http://hg.python.org/jython