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

[subset] 2to3 --fix=idioms

Browse Source
This commit is contained in:
Behdad Esfahbod 2013-11-27 04:15:27 -05:00
parent fa5f2e85ab
commit c2e2e835ec
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/fontTools/subset.py
View File

@ -1312,10 +1312,10 @@ def subset_subroutines(self, subrs, gsubrs):
assert len(p) assert len(p)
for i in range(1, len(p)): for i in range(1, len(p)):
if p[i] == 'callsubr': if p[i] == 'callsubr':
assert type(p[i-1]) is int assert isinstance(p[i-1], int)
p[i-1] = subrs._used.index(p[i-1] + subrs._old_bias) - subrs._new_bias p[i-1] = subrs._used.index(p[i-1] + subrs._old_bias) - subrs._new_bias
elif p[i] == 'callgsubr': elif p[i] == 'callgsubr':
assert type(p[i-1]) is int assert isinstance(p[i-1], int)
p[i-1] = gsubrs._used.index(p[i-1] + gsubrs._old_bias) - gsubrs._new_bias p[i-1] = gsubrs._used.index(p[i-1] + gsubrs._old_bias) - gsubrs._new_bias
@_add_method(psCharStrings.T2CharString) @_add_method(psCharStrings.T2CharString)
@ -1403,7 +1403,7 @@ class _DehintingT2Decompiler(psCharStrings.SimpleT2Decompiler):
if hints.status != 2: if hints.status != 2:
# Check from last_check, make sure we didn't have any operators. # Check from last_check, make sure we didn't have any operators.
for i in range(hints.last_checked, len(charString.program) - 1): for i in range(hints.last_checked, len(charString.program) - 1):
if type(charString.program[i]) == str: if isinstance(charString.program[i], str):
hints.status = 2 hints.status = 2
break; break;
else: else:
@ -1449,7 +1449,7 @@ class _DehintingT2Decompiler(psCharStrings.SimpleT2Decompiler):
if hints.status != 2 and hints.has_hint: if hints.status != 2 and hints.has_hint:
# Check from last_check, see if we may be an implicit vstem # Check from last_check, see if we may be an implicit vstem
for i in range(hints.last_checked, index - 1): for i in range(hints.last_checked, index - 1):
if type(cs.program[i]) == str: if isinstance(cs.program[i], str):
hints.status = 2 hints.status = 2
break; break;
if hints.status != 2: if hints.status != 2:
@ -1492,7 +1492,7 @@ class _DehintingT2Decompiler(psCharStrings.SimpleT2Decompiler):
# Check from last_check, make sure we didn't have # Check from last_check, make sure we didn't have
# any operators. # any operators.
for i in range(hints.last_checked, index - 1): for i in range(hints.last_checked, index - 1):
if type(cs.program[i]) == str: if isinstance(cs.program[i], str):
hints.status = 2 hints.status = 2
break; break;
hints.last_checked = index hints.last_checked = index