diff options
| author | Benjamin Peterson <benjamin@python.org> | 2017-06-23 05:31:08 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-23 05:31:08 (GMT) |
| commit | 279a96206f3118a482d10826a1e32b272db4505d (patch) | |
| tree | dc542b2e2764d146093fdcf1fb5590c1e190d553 /Tools/unicode | |
| parent | b066edfb1b268e90ea11f45dd1827f46d7ceec88 (diff) | |
| download | cpython-279a96206f3118a482d10826a1e32b272db4505d.zip cpython-279a96206f3118a482d10826a1e32b272db4505d.tar.gz cpython-279a96206f3118a482d10826a1e32b272db4505d.tar.bz2 | |
bpo-30736: upgrade to Unicode 10.0 (#2344)
Straightforward. While we're at it, though, strip trailing whitespace from generated tables.
Diffstat (limited to 'Tools/unicode')
| -rw-r--r-- | Tools/unicode/makeunicodedata.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Tools/unicode/makeunicodedata.py b/Tools/unicode/makeunicodedata.py index 472324f..39c9fe7 100644 --- a/Tools/unicode/makeunicodedata.py +++ b/Tools/unicode/makeunicodedata.py @@ -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): |