From b305aeb1dd1cd890dae539c63f406a3b803b84f7 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 5 Sep 2008 22:13:06 +0000
Subject: [PATCH] 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.
........
---
Lib/test/test_unicode.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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)
--
2.40.0