]> granicus.if.org Git - python/commitdiff
Revert r86517
authorRaymond Hettinger <python@rcn.com>
Sun, 21 Nov 2010 04:08:28 +0000 (04:08 +0000)
committerRaymond Hettinger <python@rcn.com>
Sun, 21 Nov 2010 04:08:28 +0000 (04:08 +0000)
Lib/decimal.py
Lib/test/test_decimal.py
Misc/NEWS

index b78c2c5774182cea073252e837421ff8fee1c328..5a9f840771148855c89464985cd7e50bb46596f2 100644 (file)
@@ -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:
index b07fb1ddb8726a4da9efb809a107e5c50682cd6c..611ef55007336db1445fce948b255a5d18ea5bd5 100644 (file)
@@ -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')))
 
index ca00d9b00508648106134f0e4d1784dfe659844f..8f09b5f5efc67f9556724f380f0e90ff9f38fc3f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.