removed unneeded use of operator.gititem and operator.setitem and replaced with idiomatic code
This commit is contained in:
parent
26b986e7c9
commit
65b337d4b9
@ -6,7 +6,6 @@ from __future__ import print_function, division, absolute_import
|
|||||||
from fontTools.misc.py23 import *
|
from fontTools.misc.py23 import *
|
||||||
from fontTools.misc.textTools import safeEval
|
from fontTools.misc.textTools import safeEval
|
||||||
from . import DefaultTable
|
from . import DefaultTable
|
||||||
import operator
|
|
||||||
import struct
|
import struct
|
||||||
|
|
||||||
|
|
||||||
@ -44,12 +43,13 @@ class table_C_O_L_R_(DefaultTable.DefaultTable):
|
|||||||
|
|
||||||
self.ColorLayers = colorLayerLists = {}
|
self.ColorLayers = colorLayerLists = {}
|
||||||
try:
|
try:
|
||||||
names = list(map(operator.getitem, [glyphOrder]*numBaseGlyphRecords, gids))
|
names = [glyphOrder[gid] for gid in gids]
|
||||||
except IndexError:
|
except IndexError:
|
||||||
getGlyphName = self.getGlyphName
|
getGlyphName = self.getGlyphName
|
||||||
names = list(map(getGlyphName, gids ))
|
names = map(getGlyphName, gids)
|
||||||
|
|
||||||
list(map(operator.setitem, [colorLayerLists]*numBaseGlyphRecords, names, layerLists))
|
for name, layerList in zip(names, layerLists):
|
||||||
|
colorLayerLists[name] = layerList
|
||||||
|
|
||||||
def compile(self, ttFont):
|
def compile(self, ttFont):
|
||||||
ordered = []
|
ordered = []
|
||||||
@ -112,7 +112,7 @@ class table_C_O_L_R_(DefaultTable.DefaultTable):
|
|||||||
layer = LayerRecord()
|
layer = LayerRecord()
|
||||||
layer.fromXML(element[0], element[1], element[2], ttFont)
|
layer.fromXML(element[0], element[1], element[2], ttFont)
|
||||||
layers.append (layer)
|
layers.append (layer)
|
||||||
operator.setitem(self, glyphName, layers)
|
self[glyphName] = layers
|
||||||
elif "value" in attrs:
|
elif "value" in attrs:
|
||||||
setattr(self, name, safeEval(attrs["value"]))
|
setattr(self, name, safeEval(attrs["value"]))
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user