[otlLib] glyph class as list and tuple instead of set and frozenset

This commit is contained in:
moyogo 2016-04-25 22:12:45 +01:00
parent 17c8e582d0
commit f81e1411b3
2 changed files with 5 additions and 5 deletions

View File

@ -589,7 +589,7 @@ class ClassDefBuilder(object):
self.useClass0_ = useClass0
def canAdd(self, glyphs):
glyphs = frozenset(glyphs)
glyphs = tuple(glyphs)
if glyphs in self.classes_:
return True
for glyph in glyphs:
@ -598,7 +598,7 @@ class ClassDefBuilder(object):
return True
def add(self, glyphs):
glyphs = frozenset(glyphs)
glyphs = tuple(glyphs)
if glyphs in self.classes_:
return
self.classes_.add(glyphs)

View File

@ -775,9 +775,9 @@ class BuilderTest(unittest.TestCase):
d0 = builder.buildValue({})
d8020 = builder.buildValue({"XPlacement": -80, "YPlacement": -20})
subtable = builder.buildPairPosClassesSubtable({
(frozenset("A"), frozenset(["zero"])): (d0, d50),
(frozenset("A"), frozenset(["one", "two"])): (None, d20),
(frozenset(["B", "C"]), frozenset(["zero"])): (d8020, d50),
(tuple("A",), tuple(["zero"])): (d0, d50),
(tuple("A",), tuple(["one", "two"])): (None, d20),
(tuple(["B", "C"]), tuple(["zero"])): (d8020, d50),
}, self.GLYPHMAP)
self.maxDiff = None
self.assertEqual(getXML(subtable.toXML),