Merge pull request #456 from madig/fix-converting-color-to-glyphs

UFO2Glyphs: Ensure color tuples consist of integers
googlefonts · Nov 7, 2018 · 297d251 · 297d251
2 parents 477f9b8 + 27f6c1e
commit 297d251
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Lib/glyphsLib/builder/glyph.py b/Lib/glyphsLib/builder/glyph.py
@@ -16,6 +16,7 @@
 import logging
 
 from defcon import Color  # noqa
+from fontTools.misc.py23 import round
 
 import glyphsLib.glyphdata
 from .common import to_ufo_time, from_loose_ufo_time

diff --git a/tests/builder/to_glyphs_test.py b/tests/builder/to_glyphs_test.py
@@ -246,8 +246,10 @@ def test_glyph_color():
 
     font = to_glyphs([ufo])
 
-    assert font.glyphs["a"].color == 3
-    assert font.glyphs["b"].color == [4, 128, 0, 255]
+    rt_a_color = font.glyphs["a"].color
+    assert rt_a_color == 3 and type(rt_a_color) is int
+    rt_b_color = font.glyphs["b"].color
+    assert rt_b_color == [4, 128, 0, 255] and all(type(x) is int for x in rt_b_color)
 
     ufo, = to_ufos(font)