diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-01-04 03:06:10 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-01-04 03:06:10 (GMT) |
| commit | a34706f101a16eef8e36054d1f405f794d53ac79 (patch) | |
| tree | c644a54978563e860c623f96c087a761e6a5776a /Lib/test/test_long.py | |
| parent | bccd63c389d72d22882264b8e9cf6e8e5911106c (diff) | |
| download | cpython-a34706f101a16eef8e36054d1f405f794d53ac79.zip cpython-a34706f101a16eef8e36054d1f405f794d53ac79.tar.gz cpython-a34706f101a16eef8e36054d1f405f794d53ac79.tar.bz2 | |
Merged revisions 59680-59695 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59686 | guido.van.rossum | 2008-01-04 00:54:04 +0100 (Fri, 04 Jan 2008) | 2 lines
Bug #1301: fixed a bad assert in _tkinter.
........
r59687 | raymond.hettinger | 2008-01-04 01:01:15 +0100 (Fri, 04 Jan 2008) | 3 lines
Finish-up the struct module optimizations started at the Iceland NFS sprint.
........
r59688 | christian.heimes | 2008-01-04 01:04:52 +0100 (Fri, 04 Jan 2008) | 1 line
Fixed #1687: plistlib.py restricts <integer> to Python int when writing
........
r59689 | christian.heimes | 2008-01-04 01:37:34 +0100 (Fri, 04 Jan 2008) | 1 line
Bug #1481296: Fixed long(float('nan'))!=0L.
........
r59691 | andrew.kuchling | 2008-01-04 02:15:50 +0100 (Fri, 04 Jan 2008) | 1 line
Markup fixes; grammar tweaks
........
r59692 | andrew.kuchling | 2008-01-04 02:16:12 +0100 (Fri, 04 Jan 2008) | 1 line
Add items
........
r59694 | christian.heimes | 2008-01-04 02:48:50 +0100 (Fri, 04 Jan 2008) | 1 line
Fixed math.copysign() on Windows
........
r59695 | christian.heimes | 2008-01-04 03:03:25 +0100 (Fri, 04 Jan 2008) | 1 line
Filled in some XXX comments
........
Diffstat (limited to 'Lib/test/test_long.py')
| -rw-r--r-- | Lib/test/test_long.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/test/test_long.py b/Lib/test/test_long.py index 8be8bff..223ef7c 100644 --- a/Lib/test/test_long.py +++ b/Lib/test/test_long.py @@ -537,6 +537,10 @@ class LongTest(unittest.TestCase): # conversion to string should fail self.assertRaises(ValueError, format, 3, "s") + 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) |