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

[merge] Remove Python 2.7 dict comprehension syntax

Browse Source 
Hopefully 2.6-happy again.
This commit is contained in:
Behdad Esfahbod 2014-04-02 18:54:53 -07:00
parent 8fec68796d
commit 14f13a993e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/fontTools/merge.py
View File

@ -450,8 +450,8 @@ def merge(self, m, tables):
for i,(table,dups) in enumerate(zip(tables, m.duplicateGlyphsPerFont)): for i,(table,dups) in enumerate(zip(tables, m.duplicateGlyphsPerFont)):
if not dups: continue if not dups: continue
assert (table is not None and table is not NotImplemented), "Have duplicates to resolve for font %d but no GSUB" % (i + 1) assert (table is not None and table is not NotImplemented), "Have duplicates to resolve for font %d but no GSUB" % (i + 1)
lookupMap = {id(v):v for v in table.table.LookupList.Lookup} lookupMap = dict((id(v),v) for v in table.table.LookupList.Lookup)
featureMap = {id(v):v for v in table.table.FeatureList.FeatureRecord} featureMap = dict((id(v),v) for v in table.table.FeatureList.FeatureRecord)
synthFeature = None synthFeature = None
synthLookup = None synthLookup = None
for script in table.table.ScriptList.ScriptRecord: for script in table.table.ScriptList.ScriptRecord:
@ -806,14 +806,14 @@ class Merger(object):
if not t: continue if not t: continue
if t.table.LookupList: if t.table.LookupList:
lookupMap = {i:id(v) for i,v in enumerate(t.table.LookupList.Lookup)} lookupMap = dict((i,id(v)) for i,v in enumerate(t.table.LookupList.Lookup))
t.table.LookupList.mapLookups(lookupMap) t.table.LookupList.mapLookups(lookupMap)
if t.table.FeatureList: if t.table.FeatureList:
# XXX Handle present FeatureList but absent LookupList # XXX Handle present FeatureList but absent LookupList
t.table.FeatureList.mapLookups(lookupMap) t.table.FeatureList.mapLookups(lookupMap)
if t.table.FeatureList and t.table.ScriptList: if t.table.FeatureList and t.table.ScriptList:
featureMap = {i:id(v) for i,v in enumerate(t.table.FeatureList.FeatureRecord)} featureMap = dict((i,id(v)) for i,v in enumerate(t.table.FeatureList.FeatureRecord))
t.table.ScriptList.mapFeatures(featureMap) t.table.ScriptList.mapFeatures(featureMap)
# TODO GDEF/Lookup MarkFilteringSets # TODO GDEF/Lookup MarkFilteringSets
@ -831,7 +831,7 @@ class Merger(object):
if not t: continue if not t: continue
if t.table.LookupList: if t.table.LookupList:
lookupMap = {id(v):i for i,v in enumerate(t.table.LookupList.Lookup)} lookupMap = dict((id(v),i) for i,v in enumerate(t.table.LookupList.Lookup))
t.table.LookupList.mapLookups(lookupMap) t.table.LookupList.mapLookups(lookupMap)
if t.table.FeatureList: if t.table.FeatureList:
# XXX Handle present FeatureList but absent LookupList # XXX Handle present FeatureList but absent LookupList
@ -839,7 +839,7 @@ class Merger(object):
if t.table.FeatureList and t.table.ScriptList: if t.table.FeatureList and t.table.ScriptList:
# XXX Handle present ScriptList but absent FeatureList # XXX Handle present ScriptList but absent FeatureList
featureMap = {id(v):i for i,v in enumerate(t.table.FeatureList.FeatureRecord)} featureMap = dict((id(v),i) for i,v in enumerate(t.table.FeatureList.FeatureRecord))
t.table.ScriptList.mapFeatures(featureMap) t.table.ScriptList.mapFeatures(featureMap)
# TODO GDEF/Lookup MarkFilteringSets # TODO GDEF/Lookup MarkFilteringSets