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

[GX] Fix ‘gvar’ unittest on Python 2.6

Browse Source 
unittest.TestCase.assertSetEqual() was added in Python 2.7,
so we default to assertEqual() on Python 2.6.
This commit is contained in:
Sascha Brawer 2015-06-10 10:09:28 +02:00
parent f121b070f7
commit ca6126ea67
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/fontTools/ttLib/tables/_g_v_a_r_test.py
View File

@ -159,6 +159,11 @@ class GlyphVariationTableTest(unittest.TestCase):
self.assertEqual({"wght": 0.0, "wdth": 0.7}, maxCoord) self.assertEqual({"wght": 0.0, "wdth": 0.7}, maxCoord)
class GlyphVariationTest(unittest.TestCase): class GlyphVariationTest(unittest.TestCase):
def __init__(self, methodName):
unittest.TestCase.__init__(self, methodName)
if not hasattr(self, "assertSetEqual"): # only in Python 2.7 and later
self.assertSetEqual = self.assertEqual
def test_equal(self): def test_equal(self):
gvar1 = GlyphVariation({"wght":(0.0, 1.0, 1.0)}, [(0,0), (9,8), (7,6)]) gvar1 = GlyphVariation({"wght":(0.0, 1.0, 1.0)}, [(0,0), (9,8), (7,6)])
gvar2 = GlyphVariation({"wght":(0.0, 1.0, 1.0)}, [(0,0), (9,8), (7,6)]) gvar2 = GlyphVariation({"wght":(0.0, 1.0, 1.0)}, [(0,0), (9,8), (7,6)])
@ -443,16 +448,12 @@ class GlyphVariationTest(unittest.TestCase):
numPointsInGlyph = 500 # greater than 255, so we also exercise code path for 16-bit encoding numPointsInGlyph = 500 # greater than 255, so we also exercise code path for 16-bit encoding
compile = GlyphVariation.compilePoints compile = GlyphVariation.compilePoints
decompile = lambda data: set(GlyphVariation.decompilePoints_(numPointsInGlyph, data, 0)[0]) decompile = lambda data: set(GlyphVariation.decompilePoints_(numPointsInGlyph, data, 0)[0])
if hasattr(self, "assertSetEqual"): # only in Python 2.7 and later
assertSetEqual = self.assertSetEqual
else:
assertSetEqual = self.assertEqual
for i in range(50): for i in range(50):
points = set(random.sample(range(numPointsInGlyph), 30)) points = set(random.sample(range(numPointsInGlyph), 30))
assertSetEqual(points, decompile(compile(points)), self.assertSetEqual(points, decompile(compile(points)),
"failed round-trip decompile/compilePoints; points=%s" % points) "failed round-trip decompile/compilePoints; points=%s" % points)
allPoints = set(range(numPointsInGlyph)) allPoints = set(range(numPointsInGlyph))
assertSetEqual(allPoints, decompile(compile(allPoints))) self.assertSetEqual(allPoints, decompile(compile(allPoints)))
def test_compileDeltas(self): def test_compileDeltas(self):
gvar = GlyphVariation({}, [(0,0), (1, 0), (2, 0), (3, 3)]) gvar = GlyphVariation({}, [(0,0), (1, 0), (2, 0), (3, 3)])