mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Use a more robust infinity check in _Py_HashDouble.

Browse source 
This fixes a test_decimal failure on FreeBSD 8.0.  (modf apparently
doesn't follow C99 Annex F on FreeBSD.)
This commit is contained in:
Mark Dickinson 2010-04-05 18:07:51 +00:00
parent 0c08009708
commit 5e0c2748fb
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/test/test_float.py
View file

@ -948,6 +948,15 @@ class InfNanTest(unittest.TestCase):
self.assertFalse(NAN.is_inf()) self.assertFalse(NAN.is_inf())
self.assertFalse((0.).is_inf()) self.assertFalse((0.).is_inf())
def test_hash_inf(self):
# the actual values here should be regarded as an
# implementation detail, but they need to be
# identical to those used in the Decimal module.
self.assertEqual(hash(float('inf')), 314159)
self.assertEqual(hash(float('-inf')), -271828)
self.assertEqual(hash(float('nan')), 0)
fromHex = float.fromhex fromHex = float.fromhex
toHex = float.hex toHex = float.hex
class HexFloatTestCase(unittest.TestCase): class HexFloatTestCase(unittest.TestCase):

6
Objects/object.c
View file

@ -1025,15 +1025,15 @@ _Py_HashDouble(double v)
* of mapping keys will turn out weird. * of mapping keys will turn out weird.
*/ */
if (Py_IS_INFINITY(v))
/* can't convert to long int -- arbitrary */
v = v < 0 ? -271828.0 : 314159.0;
fractpart = modf(v, &intpart); fractpart = modf(v, &intpart);
if (fractpart == 0.0) { if (fractpart == 0.0) {
/* This must return the same hash as an equal int or long. */ /* This must return the same hash as an equal int or long. */
if (intpart > LONG_MAX/2 || -intpart > LONG_MAX/2) { if (intpart > LONG_MAX/2 || -intpart > LONG_MAX/2) {
/* Convert to long and use its hash. */ /* Convert to long and use its hash. */
PyObject *plong; /* converted to Python long */ PyObject *plong; /* converted to Python long */
if (Py_IS_INFINITY(intpart))
/* can't convert to long int -- arbitrary */
v = v < 0 ? -271828.0 : 314159.0;
plong = PyLong_FromDouble(v); plong = PyLong_FromDouble(v);
if (plong == NULL) if (plong == NULL)
return -1; return -1;