[Python-checkins] r77552 - in python/branches/release31-maint: Lib/test/test_strtod.py
mark.dickinson
python-checkins at python.org
Sat Jan 16 21:35:50 CET 2010
Author: mark.dickinson
Date: Sat Jan 16 21:35:50 2010
New Revision: 77552
Log:
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.
........
................
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Lib/test/test_strtod.py
Modified: python/branches/release31-maint/Lib/test/test_strtod.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_strtod.py (original)
+++ python/branches/release31-maint/Lib/test/test_strtod.py Sat Jan 16 21:35:50 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)
More information about the Python-checkins
mailing list