mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-09 18:48:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

long(float('nan')) raises an OverflowError as discussed on the mailing list a week ago

Browse source
This commit is contained in:
Christian Heimes 2008-01-15 02:01:20 +00:00
parent 62fe8a8e1c
commit 386cd1e3c9
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_long.py
View file

@ -539,7 +539,7 @@ class LongTest(unittest.TestCase):
def test_nan_inf(self): def test_nan_inf(self):
self.assertRaises(OverflowError, int, float('inf')) self.assertRaises(OverflowError, int, float('inf'))
self.assertEqual(int(float('nan')), 0) self.assertRaises(OverflowError, int, float('nan'))
def test_main(): def test_main():
test_support.run_unittest(LongTest) test_support.run_unittest(LongTest)

3
Misc/NEWS
View file

@ -12,6 +12,9 @@ What's New in Python 3.0a3?
Core and Builtins Core and Builtins
----------------- -----------------
- Object/longobject.c: long(float('nan')) raises an OverflowError instead
of returning 0.
- Issue #1762972: __file__ points to the source file instead of the pyc/pyo - Issue #1762972: __file__ points to the source file instead of the pyc/pyo
file if the py file exists. file if the py file exists.

4
Objects/longobject.c
View file

@ -255,7 +255,9 @@ PyLong_FromDouble(double dval)
return NULL; return NULL;
} }
if (Py_IS_NAN(dval)) { if (Py_IS_NAN(dval)) {
return PyLong_FromLong(0L); PyErr_SetString(PyExc_OverflowError,
"cannot convert float NaN to int");
return NULL;
} }
if (dval < 0.0) { if (dval < 0.0) {
neg = 1; neg = 1;