[Python-checkins] gh-92536: Update unicode struct size to ensure MemoryError is raised (GH-92867)
sweeneyde
webhook-mailer at python.org
Tue May 17 10:12:30 EDT 2022
https://github.com/python/cpython/commit/19a4252459540913d0fd69beb66454f7c19bfef8
commit: 19a4252459540913d0fd69beb66454f7c19bfef8
branch: main
author: Dennis Sweeney <36520290+sweeneyde at users.noreply.github.com>
committer: sweeneyde <36520290+sweeneyde at users.noreply.github.com>
date: 2022-05-17T10:12:21-04:00
summary:
gh-92536: Update unicode struct size to ensure MemoryError is raised (GH-92867)
files:
M Lib/test/test_unicode.py
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index c98fabf8bc9b5..64abc0c761b3c 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -2370,14 +2370,9 @@ def test_expandtabs_optimization(self):
self.assertIs(s.expandtabs(), s)
def test_raiseMemError(self):
- if struct.calcsize('P') == 8:
- # 64 bits pointers
- ascii_struct_size = 48
- compact_struct_size = 72
- else:
- # 32 bits pointers
- ascii_struct_size = 24
- compact_struct_size = 36
+ null_byte = 1
+ ascii_struct_size = sys.getsizeof("a") - len("a") - null_byte
+ compact_struct_size = sys.getsizeof("\xff") - len("\xff") - null_byte
for char in ('a', '\xe9', '\u20ac', '\U0010ffff'):
code = ord(char)
@@ -2395,8 +2390,9 @@ def test_raiseMemError(self):
# be allocatable, given enough memory.
maxlen = ((sys.maxsize - struct_size) // char_size)
alloc = lambda: char * maxlen
- self.assertRaises(MemoryError, alloc)
- self.assertRaises(MemoryError, alloc)
+ with self.subTest(char=char):
+ self.assertRaises(MemoryError, alloc)
+ self.assertRaises(MemoryError, alloc)
def test_format_subclass(self):
class S(str):
More information about the Python-checkins
mailing list