[Python-3000-checkins] r66236 - in python/branches/py3k: Lib/test/test_unicode.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Sat Sep 6 00:13:06 2008
New Revision: 66236

Log:
Merged revisions 66235 via svnmerge from
svn+ssh://pythondev at svn.python.org/python/trunk

........
r66235 | antoine.pitrou | 2008-09-06 00:04:54 +0200 (sam., 06 sept. 2008) | 6 lines

#3601: test_unicode.test_raiseMemError fails in UCS4

Reviewed by Benjamin Peterson on IRC.
........


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

Modified: python/branches/py3k/Lib/test/test_unicode.py
==============================================================================
--- python/branches/py3k/Lib/test/test_unicode.py (original)
+++ python/branches/py3k/Lib/test/test_unicode.py Sat Sep 6 00:13:06 2008
@@ -1160,7 +1160,10 @@
# when a string allocation fails with a MemoryError.
# This used to crash the interpreter,
# or leak references when the number was smaller.
- alloc = lambda: "a" * (sys.maxsize - 100)
+ charwidth = 4 if sys.maxunicode >= 0x10000 else 2
+ # Note: sys.maxsize is half of the actual max allocation because of
+ # the signedness of Py_ssize_t.
+ alloc = lambda: "a" * (sys.maxsize // charwidth * 2)
self.assertRaises(MemoryError, alloc)
self.assertRaises(MemoryError, alloc)