mirror of https://github.com/python/cpython.git
Issue #15544: Fix Decimal.__float__ to work with payload-carrying NaNs.
This commit is contained in:
parent
85ede8da00
commit
088cec3ab7
|
@ -1581,7 +1581,13 @@ def __rfloordiv__(self, other, context=None):
|
||||||
|
|
||||||
def __float__(self):
|
def __float__(self):
|
||||||
"""Float representation."""
|
"""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):
|
def __int__(self):
|
||||||
"""Converts self to an int, truncating if necessary."""
|
"""Converts self to an int, truncating if necessary."""
|
||||||
|
|
|
@ -1448,6 +1448,20 @@ def test_tonum_methods(self):
|
||||||
self.assertEqual(float(d1), 66)
|
self.assertEqual(float(d1), 66)
|
||||||
self.assertEqual(float(d2), 15.32)
|
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))
|
||||||
|
sign = math.copysign(1.0, f)
|
||||||
|
self.assertEqual(sign, -1.0 if s.startswith('-') else 1.0)
|
||||||
|
|
||||||
|
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):
|
def test_eval_round_trip(self):
|
||||||
|
|
||||||
#with zero
|
#with zero
|
||||||
|
|
|
@ -95,6 +95,8 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue #15544: Fix Decimal.__float__ to work with payload-carrying NaNs.
|
||||||
|
|
||||||
- Issue #15199: Fix JavaScript's default MIME type to application/javascript.
|
- Issue #15199: Fix JavaScript's default MIME type to application/javascript.
|
||||||
Patch by Bohuslav Kabrda.
|
Patch by Bohuslav Kabrda.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue