From 863d61d79b86f216107f5adad12a3cdc4dfb7dd0 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Sat, 16 Jan 2010 20:35:50 +0000 Subject: [PATCH] Merged revisions 77551 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77551 | mark.dickinson | 2010-01-16 20:34:30 +0000 (Sat, 16 Jan 2010) | 9 lines Merged revisions 77550 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77550 | mark.dickinson | 2010-01-16 20:33:02 +0000 (Sat, 16 Jan 2010) | 1 line Add better error reporting for MemoryErrors caused by str->float conversions. ........ ................ --- Lib/test/test_strtod.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Lib/test/test_strtod.py b/Lib/test/test_strtod.py index b5a630edaf..a838b043f2 100644 --- a/Lib/test/test_strtod.py +++ b/Lib/test/test_strtod.py @@ -91,6 +91,8 @@ class StrtodTests(unittest.TestCase): fs = float(s) except OverflowError: got = '-inf' if s[0] == '-' else 'inf' + except MemoryError: + got = 'memory error' else: got = fs.hex() expected = strtod(s) -- 2.40.0