djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py/makeqstrdata: Reinstate Python2 compatibility.

Browse Source
This commit is contained in:
Damien George 2016-04-14 14:37:04 +01:00
parent 49bb04ee64
commit 2243d68345
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
py/makeqstrdata.py
View File

@ -9,11 +9,15 @@ from __future__ import print_function
import re import re
import sys import sys
# codepoint2name is different in Python 2 to Python 3 # Python 2/3 compatibility:
# - iterating through bytes is different
# - codepoint2name lives in a different module
import platform import platform
if platform.python_version_tuple()[0] == '2': if platform.python_version_tuple()[0] == '2':
ord_bytes = ord
from htmlentitydefs import codepoint2name from htmlentitydefs import codepoint2name
elif platform.python_version_tuple()[0] == '3': elif platform.python_version_tuple()[0] == '3':
ord_bytes = lambda x:x
from html.entities import codepoint2name from html.entities import codepoint2name
codepoint2name[ord('-')] = 'hyphen'; codepoint2name[ord('-')] = 'hyphen';
@ -114,7 +118,7 @@ def make_bytes(cfg_bytes_len, cfg_bytes_hash, qstr):
# qstr contains non-printable codes so render entire thing as hex pairs # qstr contains non-printable codes so render entire thing as hex pairs
qbytes = qstr.encode('utf8') qbytes = qstr.encode('utf8')
qlen = len(qbytes) qlen = len(qbytes)
qdata = ''.join(('\\x%02x' % b) for b in qbytes) qdata = ''.join(('\\x%02x' % ord_bytes(b)) for b in qbytes)
if qlen >= (1 << (8 * cfg_bytes_len)): if qlen >= (1 << (8 * cfg_bytes_len)):
print('qstr is too long:', qstr) print('qstr is too long:', qstr)
assert False assert False