Bug #1481296: Fixed long(float('nan'))!=0L.
diff --git a/Lib/test/test_long.py b/Lib/test/test_long.py
index 29515c7..d745350 100644
--- a/Lib/test/test_long.py
+++ b/Lib/test/test_long.py
@@ -498,6 +498,10 @@
eq(x > y, Rcmp > 0, Frm("%r > %r %d", x, y, Rcmp))
eq(x >= y, Rcmp >= 0, Frm("%r >= %r %d", x, y, Rcmp))
+ def test_nan_inf(self):
+ self.assertRaises(OverflowError, long, float('inf'))
+ self.assertEqual(long(float('nan')), 0L)
+
def test_main():
test_support.run_unittest(LongTest)
diff --git a/Misc/NEWS b/Misc/NEWS
index 87de123..bd98e38 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@
Core and builtins
-----------------
+- Bug #1481296: Fixed long(float('nan'))!=0L.
+
- Issue #1640: Added math.isinf(x), math.isnan(x) and math.copysign(x, y)
functions.
diff --git a/Objects/longobject.c b/Objects/longobject.c
index 262b40a..e2ffb35 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -170,6 +170,9 @@
"cannot convert float infinity to long");
return NULL;
}
+ if (Py_IS_NAN(dval)) {
+ return PyLong_FromLong(0L);
+ }
if (dval < 0.0) {
neg = 1;
dval = -dval;