Author: David Schneider <david.schnei...@picle.org> Branch: Changeset: r56563:24b124b98d2d Date: 2012-08-03 14:42 +0200 http://bitbucket.org/pypy/pypy/changeset/24b124b98d2d/
Log: merge heads diff --git a/pypy/jit/metainterp/test/test_ajit.py b/pypy/jit/metainterp/test/test_ajit.py --- a/pypy/jit/metainterp/test/test_ajit.py +++ b/pypy/jit/metainterp/test/test_ajit.py @@ -3797,6 +3797,7 @@ assert res == 3 def test_float_bytes(self): + from pypy.rlib.rfloat import isnan def f(n): ll = float2longlong(n) return longlong2float(ll) @@ -3804,7 +3805,7 @@ for x in [2.5, float("nan"), -2.5, float("inf")]: # There are tests elsewhere to verify the correctness of this. res = self.interp_operations(f, [x]) - assert res == x or math.isnan(x) and math.isnan(res) + assert res == x or isnan(x) and isnan(res) class TestLLtype(BaseLLtypeTests, LLJitMixin): _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit