From f089fd67fc271b0a777f4c04110c5c39a7b23723 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Fri, 19 Mar 2010 14:25:03 +0000 Subject: 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. ........ --- Tools/unicode/gencodec.py | 3 +-- Tools/unicode/makeunicodedata.py | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'Tools/unicode') diff --git a/Tools/unicode/gencodec.py b/Tools/unicode/gencodec.py index 198ae56abb..65fe5e5d82 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 040ac8997b..4eda1b98cd 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: -- cgit v1.2.1