diff options
| author | Georg Brandl <georg@python.org> | 2008-06-04 13:01:30 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-06-04 13:01:30 (GMT) |
| commit | a26f8ca668d09eff8ab03ef3d1cddb9bfbc6d124 (patch) | |
| tree | 4b3704507702b98e0ce4107403a72093a5d6b9fc /Tools | |
| parent | f954c4b9fb8529cc13a2e24c58137c66ac836b28 (diff) | |
| download | cpython-a26f8ca668d09eff8ab03ef3d1cddb9bfbc6d124.zip cpython-a26f8ca668d09eff8ab03ef3d1cddb9bfbc6d124.tar.gz cpython-a26f8ca668d09eff8ab03ef3d1cddb9bfbc6d124.tar.bz2 | |
Revert r63934 -- it was mixing two patches.
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/unicode/makeunicodedata.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Tools/unicode/makeunicodedata.py b/Tools/unicode/makeunicodedata.py index 93b3937..885e559 100644 --- a/Tools/unicode/makeunicodedata.py +++ b/Tools/unicode/makeunicodedata.py @@ -60,7 +60,6 @@ TITLE_MASK = 0x40 UPPER_MASK = 0x80 XID_START_MASK = 0x100 XID_CONTINUE_MASK = 0x200 -NONPRINTABLE_MASK = 0x400 def maketables(trace=0): @@ -72,7 +71,7 @@ def maketables(trace=0): EASTASIAN_WIDTH % version, DERIVED_CORE_PROPERTIES % version) - print(len(list(filter(None, unicode.table))), "characters") + print(len(filter(None, unicode.table)), "characters") for version in old_versions: print("--- Reading", UNICODE_DATA % ("-"+version), "...") @@ -80,7 +79,7 @@ def maketables(trace=0): COMPOSITION_EXCLUSIONS % ("-"+version), EASTASIAN_WIDTH % ("-"+version), DERIVED_CORE_PROPERTIES % ("-"+version)) - print(len(list(filter(None, old_unicode.table))), "characters") + print(len(filter(None, old_unicode.table)), "characters") merge_old_version(version, unicode, old_unicode) makeunicodename(unicode, trace) @@ -372,10 +371,6 @@ def makeunicodetype(unicode, trace): flags |= TITLE_MASK if category == "Lu": flags |= UPPER_MASK - if category[0] == "C": - flags |= NONPRINTABLE_MASK - if category[0] == "Z" and char != " ": - flags |= NONPRINTABLE_MASK if "XID_Start" in properties: flags |= XID_START_MASK if "XID_Continue" in properties: @@ -470,7 +465,7 @@ def makeunicodename(unicode, trace): if name and name[0] != "<": names[char] = name + chr(0) - print(len(list(n for n in names if n is not None)), "distinct names") + print(len(n for n in names if n is not None), "distinct names") # collect unique words from names (note that we differ between # words inside a sentence, and words ending a sentence. the |