changeset: 78744:49014c59b31f parent: 78742:150c58d98a5d user: Mark Dickinson date: Fri Aug 24 18:53:10 2012 +0100 files: Lib/decimal.py Lib/test/test_decimal.py Misc/NEWS Modules/_decimal/_decimal.c description: Issue #15544: Fix Decimal.__float__ to work with payload-carrying NaNs. diff -r 150c58d98a5d -r 49014c59b31f Lib/decimal.py --- a/Lib/decimal.py Fri Aug 24 19:47:02 2012 +0200 +++ b/Lib/decimal.py Fri Aug 24 18:53:10 2012 +0100 @@ -1601,7 +1601,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 -r 150c58d98a5d -r 49014c59b31f Lib/test/test_decimal.py --- a/Lib/test/test_decimal.py Fri Aug 24 19:47:02 2012 +0200 +++ b/Lib/test/test_decimal.py Fri Aug 24 18:53:10 2012 +0100 @@ -1942,6 +1942,22 @@ for d, n, r in test_triples: self.assertEqual(str(round(Decimal(d), n)), r) + 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): Decimal = self.decimal.Decimal diff -r 150c58d98a5d -r 49014c59b31f Misc/NEWS --- a/Misc/NEWS Fri Aug 24 19:47:02 2012 +0200 +++ b/Misc/NEWS Fri Aug 24 18:53:10 2012 +0100 @@ -32,6 +32,8 @@ Library ------- +- Issue #15544: Fix Decimal.__float__ to work with payload-carrying NaNs. + - Issue #15776: Allow pyvenv to work in existing directory with --clean. - Issue #15249: BytesGenerator now correctly mangles From lines (when diff -r 150c58d98a5d -r 49014c59b31f Modules/_decimal/_decimal.c --- a/Modules/_decimal/_decimal.c Fri Aug 24 19:47:02 2012 +0200 +++ b/Modules/_decimal/_decimal.c Fri Aug 24 18:53:10 2012 +0100 @@ -3357,7 +3357,23 @@ { PyObject *f, *s; - s = dec_str(dec); + if (mpd_isnan(MPD(dec))) { + if (mpd_issnan(MPD(dec))) { + PyErr_SetString(PyExc_ValueError, + "cannot convert signaling NaN to float"); + return NULL; + } + if (mpd_isnegative(MPD(dec))) { + s = PyUnicode_FromString("-nan"); + } + else { + s = PyUnicode_FromString("nan"); + } + } + else { + s = dec_str(dec); + } + if (s == NULL) { return NULL; }