From c05b7890bcc608e56fab19344b9566d2f500911d Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Tue, 8 Sep 2009 19:22:18 +0000 Subject: [PATCH] Merged revisions 74708 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74708 | mark.dickinson | 2009-09-07 19:04:58 +0100 (Mon, 07 Sep 2009) | 2 lines #Issue 6795: Fix infinite recursion in long(Decimal('nan')); change int(Decimal('nan')) to raise ValueError instead of either returning NaN or raising InvalidContext. ........ --- Lib/decimal.py | 5 ++--- Lib/test/test_decimal.py | 10 ++++++++++ Misc/NEWS | 4 ++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Lib/decimal.py b/Lib/decimal.py index 4108fb8901..43244308c0 100644 --- a/Lib/decimal.py +++ b/Lib/decimal.py @@ -1512,10 +1512,9 @@ class Decimal(object): """Converts self to an int, truncating if necessary.""" if self._is_special: if self._isnan(): - context = getcontext() - return context._raise_error(InvalidContext) + raise ValueError("Cannot convert NaN to integer") elif self._isinfinity(): - raise OverflowError("Cannot convert infinity to int") + raise OverflowError("Cannot convert infinity to integer") s = (-1)**self._sign if self._exp >= 0: return s*int(self._int)*10**self._exp diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py index 79b6a8563d..c671d7ba3d 100644 --- a/Lib/test/test_decimal.py +++ b/Lib/test/test_decimal.py @@ -1372,6 +1372,16 @@ class DecimalPythonAPItests(unittest.TestCase): r = d.to_integral(ROUND_DOWN) self.assertEqual(Decimal(int(d)), r) + self.assertRaises(ValueError, int, Decimal('-nan')) + self.assertRaises(ValueError, int, Decimal('snan')) + self.assertRaises(OverflowError, int, Decimal('inf')) + self.assertRaises(OverflowError, int, Decimal('-inf')) + + self.assertRaises(ValueError, long, Decimal('-nan')) + self.assertRaises(ValueError, long, Decimal('snan')) + self.assertRaises(OverflowError, long, Decimal('inf')) + self.assertRaises(OverflowError, long, Decimal('-inf')) + def test_trunc(self): for x in range(-250, 250): s = '%0.2f' % (x / 100.0) diff --git a/Misc/NEWS b/Misc/NEWS index 3162b5a903..c44a56d75c 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -74,6 +74,10 @@ Core and Builtins Library ------- +- Issue #6795: int(Decimal('nan')) now raises ValueError instead of + returning NaN or raising InvalidContext. Also, fix infinite recursion + in long(Decimal('nan')). + - Issue #6850: Fix bug in Decimal._parse_format_specifier for formats with no type specifier. -- 2.40.0