Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Bug #1481296: Fixed long(float('nan'))!=0L.

This commit is contained in:
Christian Heimes 2008-01-04 00:37:34 +00:00
parent 0613188bc3
commit 8267d1dfe5
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_long.py
View File

@ -498,6 +498,10 @@ class LongTest(unittest.TestCase):
eq(x > y, Rcmp > 0, Frm("%r > %r %d", x, y, Rcmp)) eq(x > y, Rcmp > 0, Frm("%r > %r %d", x, y, Rcmp))
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(): def test_main():
test_support.run_unittest(LongTest) test_support.run_unittest(LongTest)

2
Misc/NEWS
View File

@ -12,6 +12,8 @@ What's New in Python 2.6 alpha 1?
Core and builtins Core and builtins
----------------- -----------------
- Bug #1481296: Fixed long(float('nan'))!=0L.
- Issue #1640: Added math.isinf(x), math.isnan(x) and math.copysign(x, y) - Issue #1640: Added math.isinf(x), math.isnan(x) and math.copysign(x, y)
functions. functions.

3
Objects/longobject.c
View File

@ -170,6 +170,9 @@ PyLong_FromDouble(double dval)
"cannot convert float infinity to long"); "cannot convert float infinity to long");
return NULL; return NULL;
} }
if (Py_IS_NAN(dval)) {
return PyLong_FromLong(0L);
}
if (dval < 0.0) { if (dval < 0.0) {
neg = 1; neg = 1;
dval = -dval; dval = -dval;