[pypy-commit] pypy py3.5: fix merge

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.5
Changeset: r93688:db253d82be12
Date: 2018-01-20 19:24 +0200
http://bitbucket.org/pypy/pypy/changeset/db253d82be12/

Log:	fix merge

diff --git a/pypy/objspace/std/floatobject.py b/pypy/objspace/std/floatobject.py
--- a/pypy/objspace/std/floatobject.py
+++ b/pypy/objspace/std/floatobject.py
@@ -731,8 +731,10 @@
 
 
 def _hash_float(space, v):
-    if math.isnan(v):
-        return 0
+    if not isfinite(v):
+        if isinf(v):
+            return HASH_INF if v > 0 else -HASH_INF
+        return HASH_NAN
 
     m, e = math.frexp(v)