diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2008-09-05 22:13:06 +0000 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2008-09-05 22:13:06 +0000 |
| commit | 8fcbd4f5da7e13b49ccf6719c99214f643baf59f (patch) | |
| tree | 52079a5a778c412a835ce2c07852f59390cb8719 | |
| parent | d1ac1ef986067ab0573baecc45e30ab9980ba2ee (diff) | |
| download | cpython-8fcbd4f5da7e13b49ccf6719c99214f643baf59f.tar.gz | |
Merged revisions 66235 via svnmerge from
svn+ssh://pythondev@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.
........
| -rw-r--r-- | Lib/test/test_unicode.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index f82a64280e..d8c4778c6f 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -1160,7 +1160,10 @@ class UnicodeTest( # 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) |