mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-12 13:55:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Issue #14874: Restore charmap decoding speed to pre-PEP 393 levels.

Browse source 
Patch by Serhiy Storchaka.
This commit is contained in:
Antoine Pitrou 2012-06-16 22:48:21 +02:00
parent c62bd13cb2
commit aaefac76dd
11 changed files with 1123 additions and 431 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Tools/unicode/gencodec.py
View file

@ -102,7 +102,7 @@ def readmap(filename):
comment = ''
else:
comment = comment[1:].strip()
if enc < 256:
if not isinstance(enc, tuple) and enc < 256:
if enc in unmapped:
unmapped.remove(enc)
if enc == uni:
@ -202,11 +202,10 @@ def python_tabledef_code(varname, map, comments=1, key_precision=2):
# Analyze map and create table dict
mappings = sorted(map.items())
table = {}
maxkey = 0
maxkey = 255
if 'IDENTITY' in map:
for key in range(256):
table[key] = (key, '')
maxkey = 255
del map['IDENTITY']
for mapkey, mapvalue in mappings:
mapcomment = ''
@ -224,6 +223,7 @@ def python_tabledef_code(varname, map, comments=1, key_precision=2):
return None
# Create table code
maxchar = 0
for key in range(maxkey + 1):
if key not in table:
mapvalue = MISSING_CODE
@ -238,6 +238,7 @@ def python_tabledef_code(varname, map, comments=1, key_precision=2):
return None
else:
mapchar = chr(mapvalue)
maxchar = max(maxchar, ord(mapchar))
if mapcomment and comments:
append(' %a \t# %s -> %s' % (mapchar,
hexrepr(key, key_precision),
@ -245,6 +246,8 @@ def python_tabledef_code(varname, map, comments=1, key_precision=2):
else:
append(' %a' % mapchar)
if maxchar < 256:
append(' %a \t## Widen to UCS2 for optimization' % UNI_UNDEFINED)
append(')')
return l