[Python-checkins] r77551 - in python/branches/py3k: Lib/test/test_strtod.py

[mark.dickinson]

Author: mark.dickinson
Date: Sat Jan 16 21:34:30 2010
New Revision: 77551

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_strtod.py

Modified: python/branches/py3k/Lib/test/test_strtod.py
==============================================================================
--- python/branches/py3k/Lib/test/test_strtod.py	(original)
+++ python/branches/py3k/Lib/test/test_strtod.py	Sat Jan 16 21:34:30 2010
@@ -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)