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

Merged revisions 78982,78986 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Florent Xicluna 2010-03-19 14:25:03 +00:00
parent faa663f03d
commit f089fd67fc
5 changed files with 40 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Tools/unicode/makeunicodedata.py
View file

@ -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: