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

Changed map(operator...) into idiomatic list comprehensions

Browse Source
This commit is contained in:
justvanrossum 2019-03-03 12:55:05 +01:00
parent 5c2d7466d2
commit ce6dbdef92
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/fontTools/ttLib/tables/V_O_R_G_.py
View File

@ -30,12 +30,13 @@ class table_V_O_R_G_(DefaultTable.DefaultTable):
self.VOriginRecords = vOrig = {} self.VOriginRecords = vOrig = {}
glyphOrder = ttFont.getGlyphOrder() glyphOrder = ttFont.getGlyphOrder()
try: try:
names = map(operator.getitem, [glyphOrder]*self.numVertOriginYMetrics, gids) names = [glyphOrder[gid] for gid in gids]
except IndexError: except IndexError:
getGlyphName = self.getGlyphName getGlyphName = self.getGlyphName
names = map(getGlyphName, gids ) names = map(getGlyphName, gids)
list(map(operator.setitem, [vOrig]*self.numVertOriginYMetrics, names, vids)) for name, vid in zip(names, vids):
vOrig[name] = vid
def compile(self, ttFont): def compile(self, ttFont):
vorgs = list(self.VOriginRecords.values()) vorgs = list(self.VOriginRecords.values())
@ -43,10 +44,10 @@ class table_V_O_R_G_(DefaultTable.DefaultTable):
nameMap = ttFont.getReverseGlyphMap() nameMap = ttFont.getReverseGlyphMap()
lenRecords = len(vorgs) lenRecords = len(vorgs)
try: try:
gids = map(operator.getitem, [nameMap]*lenRecords, names) gids = [nameMap[name] for name in names]
except KeyError: except KeyError:
nameMap = ttFont.getReverseGlyphMap(rebuild=True) nameMap = ttFont.getReverseGlyphMap(rebuild=True)
gids = map(operator.getitem, [nameMap]*lenRecords, names) gids = [nameMap[name] for name in names]
vOriginTable = list(zip(gids, vorgs)) vOriginTable = list(zip(gids, vorgs))
self.numVertOriginYMetrics = lenRecords self.numVertOriginYMetrics = lenRecords
vOriginTable.sort() # must be in ascending GID order vOriginTable.sort() # must be in ascending GID order