shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make python3 happy

Browse Source
This commit is contained in:
Martin Hosken 2017-09-15 13:45:55 +07:00 committed by Sascha Brawer
parent 9f44ce541c
commit 437b3ead2e
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/fontTools/ttLib/tables/G__l_a_t.py
View File

@ -97,7 +97,7 @@ class table_G__l_a_t(DefaultTable.DefaultTable):
keys = range(e.attNum, e.attNum+e.num)
if len(data) >= 2 * e.num :
vals = struct.unpack_from(('>%dh' % e.num), data)
attributes.update(izip(keys,vals))
attributes.update(zip(keys,vals))
data = data[2*e.num:]
return attributes

18
Lib/fontTools/ttLib/tables/S__i_l_f.py
View File

@ -6,7 +6,7 @@ from itertools import *
from . import DefaultTable
from . import grUtils
from array import array
import struct, operator, warnings, re
import struct, operator, warnings, re, sys
Silf_hdr_format = '''
>
@ -195,7 +195,7 @@ def disassemble(aCode):
pc = 0
res = []
while pc < codelen:
opcode = ord(aCode[pc])
opcode = ord(aCode[pc:pc+1])
if opcode > len(aCode_info):
instr = aCode_info[0]
else:
@ -226,17 +226,17 @@ def assemble(instrs):
if not m or not m.group(1) in aCode_map:
continue
opcode, parmfmt = aCode_map[m.group(1)]
res.append(chr(opcode))
res.append(struct.pack("B", opcode))
if m.group(2):
if parmfmt == 0:
continue
parms = map(int, re.split(",\s*", m.group(2)))
if parmfmt == -1:
res.append(chr(len(parms)))
res.append("".join(map(chr, parms)))
l = len(parms)
res.append(struct.pack(("%dB" % (l+1)), l, *parms))
else:
res.append(struct.pack(parmfmt, *parms))
return "".join(res)
return b"".join(res)
def writecode(tag, writer, instrs):
writer.begintag(tag)
@ -697,7 +697,7 @@ class Pass(object):
oRuleMap = struct.unpack_from((">%dH" % (self.numSuccess + 1)), data)
data = data[2+2*self.numSuccess:]
rules = struct.unpack_from((">%dH" % oRuleMap[-1]), data)
self.rules = [rules[s:e] for (s,e) in izip(oRuleMap, oRuleMap[1:])]
self.rules = [rules[s:e] for (s,e) in zip(oRuleMap, oRuleMap[1:])]
data = data[2*oRuleMap[-1]:]
(self.minRulePreContext, self.maxRulePreContext) = struct.unpack('BB', data[:2])
numStartStates = self.maxRulePreContext - self.minRulePreContext + 1
@ -725,12 +725,12 @@ class Pass(object):
for i in range(len(oConstraints)-2,-1,-1):
if oConstraints[i] == 0 :
oConstraints[i] = oConstraints[i+1]
self.ruleConstraints = [(data[s:e] if (e-s > 1) else "") for (s,e) in izip(oConstraints, oConstraints[1:])]
self.ruleConstraints = [(data[s:e] if (e-s > 1) else "") for (s,e) in zip(oConstraints, oConstraints[1:])]
data = data[oConstraints[-1]:]
for i in range(len(oActions)-2,-1,-1):
if oActions[i] == 0:
oActions[i] = oActions[i+1]
self.actions = [(data[s:e] if (e-s > 1) else "") for (s,e) in izip(oActions, oActions[1:])]
self.actions = [(data[s:e] if (e-s > 1) else "") for (s,e) in zip(oActions, oActions[1:])]
data = data[oActions[-1]:]
# not using debug

2
Lib/fontTools/ttLib/tables/S__i_l_l.py
View File

@ -27,7 +27,7 @@ class table_S__i_l_l(DefaultTable.DefaultTable):
(langcode, numsettings, offset) = struct.unpack(">4sHH",
data[i * 8:(i+1) * 8])
offset = int(offset / 8) - (numLangs + 1)
langcode = langcode.replace('\000', '')
langcode = langcode.replace(b'\000', b'')
langinfo.append((langcode, numsettings, offset))
maxsetting = max(maxsetting, offset + numsettings)
data = data[numLangs * 8:]

4
Lib/fontTools/ttLib/tables/grUtils.py
View File

@ -68,12 +68,12 @@ def num2tag(n):
if n < 0x200000:
return str(n)
else:
return struct.unpack('4s', struct.pack('>L', n))[0].replace('\000', '')
return struct.unpack('4s', struct.pack('>L', n))[0].replace(b'\000', b'').decode()
def tag2num(n):
try:
return int(n)
except ValueError:
n = (n+" ")[:4]
return struct.unpack('>L', n)[0]
return struct.unpack('>L', n.encode('ascii'))[0]