diff options
author | Raymond Hettinger <python@rcn.com> | 2010-11-21 04:08:28 (GMT) |
---|---|---|
committer | Raymond Hettinger <python@rcn.com> | 2010-11-21 04:08:28 (GMT) |
commit | d325c4b233bdf36110c4c97e51b895972cbcf672 (patch) | |
tree | 844c017173db101ba42ad059dd8ba798e6d04a69 | |
parent | 2dad5cade41eb8ba9880427f313ac2f1d2e1a505 (diff) | |
download | cpython-d325c4b233bdf36110c4c97e51b895972cbcf672.zip cpython-d325c4b233bdf36110c4c97e51b895972cbcf672.tar.gz cpython-d325c4b233bdf36110c4c97e51b895972cbcf672.tar.bz2 |
Revert r86517
-rw-r--r-- | Lib/decimal.py | 2 | ||||
-rw-r--r-- | Lib/test/test_decimal.py | 2 | ||||
-rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/Lib/decimal.py b/Lib/decimal.py index b78c2c5..5a9f840 100644 --- a/Lib/decimal.py +++ b/Lib/decimal.py @@ -943,7 +943,7 @@ class Decimal(object): # in the documentation. (See library docs, 'Built-in Types'). if self._is_special: if self.is_snan(): - raise ValueError('Cannot hash a signaling NaN value.') + raise TypeError('Cannot hash a signaling NaN value.') elif self.is_nan(): return _PyHASH_NAN else: diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py index b07fb1d..611ef55 100644 --- a/Lib/test/test_decimal.py +++ b/Lib/test/test_decimal.py @@ -1346,7 +1346,7 @@ class DecimalUsabilityTest(unittest.TestCase): #the same hash that to an int self.assertEqual(hashit(Decimal(23)), hashit(23)) - self.assertRaises(ValueError, hash, Decimal('sNaN')) + self.assertRaises(TypeError, hash, Decimal('sNaN')) self.assertTrue(hashit(Decimal('Inf'))) self.assertTrue(hashit(Decimal('-Inf'))) @@ -172,9 +172,6 @@ Library - Issue #10465: fix broken delegating of attributes by gzip._PaddedFile. -- Issue #10356: hash(Decimal("sNaN")) now raises ValueError instead of - TypeError. - - Issue #10356: Decimal.__hash__(-1) should return -2. - Issue #1553375: logging: Added stack_info kwarg to display stack information. |