From 14f13a993eda70fd97e415cc9a043d5d2416c187 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 2 Apr 2014 18:54:53 -0700 Subject: [PATCH] [merge] Remove Python 2.7 dict comprehension syntax Hopefully 2.6-happy again. --- Lib/fontTools/merge.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Lib/fontTools/merge.py b/Lib/fontTools/merge.py index 5f51ad600..54e91e37b 100644 --- a/Lib/fontTools/merge.py +++ b/Lib/fontTools/merge.py @@ -450,8 +450,8 @@ def merge(self, m, tables): for i,(table,dups) in enumerate(zip(tables, m.duplicateGlyphsPerFont)): 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) - lookupMap = {id(v):v for v in table.table.LookupList.Lookup} - featureMap = {id(v):v for v in table.table.FeatureList.FeatureRecord} + lookupMap = dict((id(v),v) for v in table.table.LookupList.Lookup) + featureMap = dict((id(v),v) for v in table.table.FeatureList.FeatureRecord) synthFeature = None synthLookup = None for script in table.table.ScriptList.ScriptRecord: @@ -806,14 +806,14 @@ class Merger(object): if not t: continue 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) if t.table.FeatureList: # XXX Handle present FeatureList but absent LookupList t.table.FeatureList.mapLookups(lookupMap) 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) # TODO GDEF/Lookup MarkFilteringSets @@ -831,7 +831,7 @@ class Merger(object): if not t: continue 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) if t.table.FeatureList: # XXX Handle present FeatureList but absent LookupList @@ -839,7 +839,7 @@ class Merger(object): if t.table.FeatureList and t.table.ScriptList: # 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) # TODO GDEF/Lookup MarkFilteringSets