mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-30736: upgrade to Unicode 10.0 (#2344)

Browse source 
Straightforward. While we're at it, though, strip trailing whitespace from generated tables.
This commit is contained in:
Benjamin Peterson 2017-06-22 22:31:08 -07:00 • committed by GitHub
parent b066edfb1b
commit 279a96206f
11 changed files with 34581 additions and 33452 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Tools/unicode/makeunicodedata.py
View file

@ -42,7 +42,7 @@ VERSION = "3.2"
# * Doc/library/stdtypes.rst, and
# * Doc/library/unicodedata.rst
# * Doc/reference/lexical_analysis.rst (two occurrences)
UNIDATA_VERSION = "9.0.0"
UNIDATA_VERSION = "10.0.0"
UNICODE_DATA = "UnicodeData%s.txt"
COMPOSITION_EXCLUSIONS = "CompositionExclusions%s.txt"
EASTASIAN_WIDTH = "EastAsianWidth%s.txt"
@ -99,11 +99,12 @@ EXTENDED_CASE_MASK = 0x4000
# these ranges need to match unicodedata.c:is_unified_ideograph
cjk_ranges = [
('3400', '4DB5'),
('4E00', '9FD5'),
('4E00', '9FEA'),
('20000', '2A6D6'),
('2A700', '2B734'),
('2B740', '2B81D'),
('2B820', '2CEA1'),
('2CEB0', '2EBE0'),
]
def maketables(trace=0):
@ -1262,12 +1263,12 @@ class Array:
for item in self.data:
i = str(item) + ", "
if len(s) + len(i) > 78:
file.write(s + "\n")
file.write(s.rstrip() + "\n")
s = " " + i
else:
s = s + i
if s.strip():
file.write(s + "\n")
file.write(s.rstrip() + "\n")
file.write("};\n\n")
def getsize(data):