Author: Christian Tismer <tis...@stackless.com>
Branch:
Changeset: r53479:b9e354abc947
Date: 2012-03-13 13:30 -0700
http://bitbucket.org/pypy/pypy/changeset/b9e354abc947/
Log: merge
diff --git a/pypy/module/math/test/test_math.py
b/pypy/module/math/test/test_math.py
--- a/pypy/module/math/test/test_math.py
+++ b/pypy/module/math/test/test_math.py
@@ -1,3 +1,4 @@
+from __future__ import with_statement
import sys
from pypy.conftest import gettestobjspace
from pypy.module.math.test import test_direct
@@ -268,3 +269,7 @@
def __trunc__(self):
return "truncated"
assert math.trunc(foo()) == "truncated"
+
+ def test_copysign_nan(self):
+ import math
+ assert math.copysign(1.0, float('-nan')) == -1.0
diff --git a/pypy/objspace/std/strutil.py b/pypy/objspace/std/strutil.py
--- a/pypy/objspace/std/strutil.py
+++ b/pypy/objspace/std/strutil.py
@@ -177,8 +177,10 @@
return INFINITY
elif low == "infinity" or low == "+infinity":
return INFINITY
- elif low == "nan" or low == "-nan" or low == "+nan":
+ elif low == "nan" or low == "+nan":
return NAN
+ elif low == "-nan":
+ return -NAN
try:
return rstring_to_float(s)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
