From: Mark Dickinson <dickinsm@gmail.com>
Date: Sat, 16 Jan 2010 20:34:30 +0000 (+0000)
Subject: Merged revisions 77550 via svnmerge from
X-Git-Tag: v3.2a1~1830
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c7d69b8a8726a3930419356871d9b0d02bb5a83;p=python

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.
........
---

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)