From ce6dbdef9291b432fb63b68a5869a38a4fdacf9c Mon Sep 17 00:00:00 2001 From: justvanrossum Date: Sun, 3 Mar 2019 12:55:05 +0100 Subject: [PATCH] Changed map(operator...) into idiomatic list comprehensions --- Lib/fontTools/ttLib/tables/V_O_R_G_.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Lib/fontTools/ttLib/tables/V_O_R_G_.py b/Lib/fontTools/ttLib/tables/V_O_R_G_.py index 8b2c317a5..1387a9e27 100644 --- a/Lib/fontTools/ttLib/tables/V_O_R_G_.py +++ b/Lib/fontTools/ttLib/tables/V_O_R_G_.py @@ -30,12 +30,13 @@ class table_V_O_R_G_(DefaultTable.DefaultTable): self.VOriginRecords = vOrig = {} glyphOrder = ttFont.getGlyphOrder() try: - names = map(operator.getitem, [glyphOrder]*self.numVertOriginYMetrics, gids) + names = [glyphOrder[gid] for gid in gids] except IndexError: 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): vorgs = list(self.VOriginRecords.values()) @@ -43,10 +44,10 @@ class table_V_O_R_G_(DefaultTable.DefaultTable): nameMap = ttFont.getReverseGlyphMap() lenRecords = len(vorgs) try: - gids = map(operator.getitem, [nameMap]*lenRecords, names) + gids = [nameMap[name] for name in names] except KeyError: nameMap = ttFont.getReverseGlyphMap(rebuild=True) - gids = map(operator.getitem, [nameMap]*lenRecords, names) + gids = [nameMap[name] for name in names] vOriginTable = list(zip(gids, vorgs)) self.numVertOriginYMetrics = lenRecords vOriginTable.sort() # must be in ascending GID order