diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-19 14:25:03 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-19 14:25:03 (GMT) |
| commit | f089fd67fc271b0a777f4c04110c5c39a7b23723 (patch) | |
| tree | 949f02c50db9f471ccf27c83302e4eef323b4354 /Tools/unicode | |
| parent | faa663f03dfeb11274f6edd787e2ec1f73623308 (diff) | |
| download | cpython-f089fd67fc271b0a777f4c04110c5c39a7b23723.zip cpython-f089fd67fc271b0a777f4c04110c5c39a7b23723.tar.gz cpython-f089fd67fc271b0a777f4c04110c5c39a7b23723.tar.bz2 | |
Merged revisions 78982,78986 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78982 | florent.xicluna | 2010-03-15 15:00:58 +0100 (lun, 15 mar 2010) | 2 lines
Remove py3k deprecation warnings from these Unicode tools.
........
r78986 | florent.xicluna | 2010-03-15 19:08:58 +0100 (lun, 15 mar 2010) | 3 lines
Issue #7783 and #7787: open_urlresource invalidates the outdated files from the local cache.
Use this feature to fix test_normalization.
........
Diffstat (limited to 'Tools/unicode')
| -rw-r--r-- | Tools/unicode/gencodec.py | 3 | ||||
| -rw-r--r-- | Tools/unicode/makeunicodedata.py | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/Tools/unicode/gencodec.py b/Tools/unicode/gencodec.py index 198ae56..65fe5e5 100644 --- a/Tools/unicode/gencodec.py +++ b/Tools/unicode/gencodec.py @@ -40,8 +40,7 @@ mapRE = re.compile('((?:0x[0-9a-fA-F]+\+?)+)' '\s*' '(#.+)?') -def parsecodes(codes, - len=len, filter=filter,range=range): +def parsecodes(codes, len=len, range=range): """ Converts code combinations to either a single code integer or a tuple of integers. diff --git a/Tools/unicode/makeunicodedata.py b/Tools/unicode/makeunicodedata.py index 040ac89..4eda1b9 100644 --- a/Tools/unicode/makeunicodedata.py +++ b/Tools/unicode/makeunicodedata.py @@ -517,8 +517,7 @@ def makeunicodetype(unicode, trace): haswide = False hasnonewide = False - spaces.sort() - for codepoint in spaces: + for codepoint in sorted(spaces): if codepoint < 0x10000: hasnonewide = True if codepoint >= 0x10000 and not haswide: @@ -546,8 +545,7 @@ def makeunicodetype(unicode, trace): print(' switch (ch) {', file=fp) haswide = False hasnonewide = False - linebreaks.sort() - for codepoint in linebreaks: + for codepoint in sorted(linebreaks): if codepoint < 0x10000: hasnonewide = True if codepoint >= 0x10000 and not haswide: |