[tools] Make hb-unicode-code work with Python 3
Related to https://github.com/behdad/harfbuzz/pull/445
This commit is contained in:
parent
edcf6344bc
commit
f2e6c7ce51
|
@ -46,6 +46,17 @@ try:
|
||||||
except NameError:
|
except NameError:
|
||||||
unichr = chr
|
unichr = chr
|
||||||
|
|
||||||
|
try:
|
||||||
|
unicode = unicode
|
||||||
|
except NameError:
|
||||||
|
unicode = str
|
||||||
|
|
||||||
|
def tounicode(s, encoding='ascii', errors='strict'):
|
||||||
|
if not isinstance(s, unicode):
|
||||||
|
return s.decode(encoding, errors)
|
||||||
|
else:
|
||||||
|
return s
|
||||||
|
|
||||||
class ColorFormatter:
|
class ColorFormatter:
|
||||||
|
|
||||||
class Null:
|
class Null:
|
||||||
|
@ -445,7 +456,7 @@ class Unicode:
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def decode (s):
|
def decode (s):
|
||||||
return u','.join ("U+%04X" % ord (u) for u in unicode (s, 'utf-8')).encode ('utf-8')
|
return u','.join ("U+%04X" % ord (u) for u in tounicode (s, 'utf-8'))
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def parse (s):
|
def parse (s):
|
||||||
|
|
Loading…
Reference in New Issue