summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2008-08-04 21:30:09 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2008-08-04 21:30:09 (GMT)
commitb646757e01d51c242eef2f9802f1ca6836a5804a (patch)
treef0976c5dcec20fa8bf42db406006df4058e394a1 /Lib/test
parentff6868cf10409441666d462af7df6a04faa45d1c (diff)
downloadcpython-b646757e01d51c242eef2f9802f1ca6836a5804a.zip
cpython-b646757e01d51c242eef2f9802f1ca6836a5804a.tar.gz
cpython-b646757e01d51c242eef2f9802f1ca6836a5804a.tar.bz2
Issue #1481296: (again!) Make conversion of a float NaN to an int or
long raise ValueError instead of returning 0. Also, change the error message for conversion of an infinity to an integer, replacing 'long' by 'integer', so that it's appropriate for both long(float('inf')) and int(float('inf')).
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_long.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_long.py b/Lib/test/test_long.py
index b67c764..e53fd05 100644
--- a/Lib/test/test_long.py
+++ b/Lib/test/test_long.py
@@ -745,7 +745,8 @@ class LongTest(unittest.TestCase):
def test_nan_inf(self):
self.assertRaises(OverflowError, long, float('inf'))
- self.assertEqual(long(float('nan')), 0L)
+ self.assertRaises(OverflowError, long, float('-inf'))
+ self.assertRaises(ValueError, long, float('nan'))
def test_main():
test_support.run_unittest(LongTest)