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.
........
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

View file

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