commit 863d61d79b86f216107f5adad12a3cdc4dfb7dd0
author Mark Dickinson <dickinsm@gmail.com> Sat Jan 16 20:35:50 2010 +0000
committer Mark Dickinson <dickinsm@gmail.com> Sat Jan 16 20:35:50 2010 +0000
tree bc787c4856519d977e60e673bc572f1e6b68ee49
parent fa606926d6386b601472ebf5e7c23ae47320788c

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

diff --git a/Lib/test/test_strtod.py b/Lib/test/test_strtod.py
index b5a630e..a838b04 100644
--- a/Lib/test/test_strtod.py
+++ b/Lib/test/test_strtod.py
@@ -91,6 +91,8 @@
             fs = float(s)
         except OverflowError:
             got = '-inf' if s[0] == '-' else 'inf'
+        except MemoryError:
+            got = 'memory error'
         else:
             got = fs.hex()
         expected = strtod(s)