From 3cbc23aa229bc5ec04845053df78eae5f54e0497 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Mon, 9 Sep 2019 08:20:40 -0700 Subject: [PATCH] bpo-37758: Cut always-constant conditionals on sys.maxunicode. (GH-15302) Since PEP 393 in Python 3.3, this value is always 0x10ffff, the maximum codepoint in Unicode; there's no longer such a thing as a UCS-2 build of Python, which couldn't properly represent some characters. There are a couple of spots left where we still condition on the value of this constant. Take them out. --- Lib/test/test_bigaddrspace.py | 2 +- Tools/unicode/mkstringprep.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_bigaddrspace.py b/Lib/test/test_bigaddrspace.py index b639f68c23..aa1f8ca75a 100644 --- a/Lib/test/test_bigaddrspace.py +++ b/Lib/test/test_bigaddrspace.py @@ -55,7 +55,7 @@ class BytesTest(unittest.TestCase): class StrTest(unittest.TestCase): - unicodesize = 2 if sys.maxunicode < 65536 else 4 + unicodesize = 4 @bigaddrspacetest def test_concat(self): diff --git a/Tools/unicode/mkstringprep.py b/Tools/unicode/mkstringprep.py index ead020c3a7..427188389a 100644 --- a/Tools/unicode/mkstringprep.py +++ b/Tools/unicode/mkstringprep.py @@ -1,9 +1,6 @@ -import re, sys +import re from unicodedata import ucd_3_2_0 as unicodedata -if sys.maxunicode == 65535: - raise RuntimeError("need UCS-4 Python") - def gen_category(cats): for i in range(0, 0x110000): if unicodedata.category(chr(i)) in cats: -- 2.40.0