test_GLIF{1,2}: use itertools.islice to skip first line with xml declaration

This commit is contained in:
Cosimo Lupo 2018-07-10 12:23:22 +01:00
parent 7bbdf6eef2
commit c51ca22a6b
No known key found for this signature in database
GPG Key ID: 59D54DB0C9976482
2 changed files with 6 additions and 6 deletions

View File

@ -2,6 +2,7 @@ from __future__ import unicode_literals
import unittest
from ufoLib.glifLib import GlifLibError, readGlyphFromString, writeGlyphToString
from ufoLib.test.testSupport import Glyph, stripText
from itertools import islice
try:
basestring
@ -25,9 +26,8 @@ class TestGLIF1(unittest.TestCase):
glyph = Glyph()
exec(py, {"glyph" : glyph, "pointPen" : glyph})
glif = writeGlyphToString(glyph.name, glyphObject=glyph, drawPointsFunc=glyph.drawPoints, formatVersion=1, validate=True)
lines = iter(glif.splitlines())
next(lines) # discard the first line containing the xml declaration
return "\n".join(lines)
# discard the first line containing the xml declaration
return "\n".join(islice(glif.splitlines(), 1, None))
def glifToPy(self, glif):
glif = stripText(glif)

View File

@ -2,6 +2,7 @@ from __future__ import unicode_literals
import unittest
from ufoLib.glifLib import GlifLibError, readGlyphFromString, writeGlyphToString
from ufoLib.test.testSupport import Glyph, stripText
from itertools import islice
try:
basestring
@ -25,9 +26,8 @@ class TestGLIF2(unittest.TestCase):
glyph = Glyph()
exec(py, {"glyph" : glyph, "pointPen" : glyph})
glif = writeGlyphToString(glyph.name, glyphObject=glyph, drawPointsFunc=glyph.drawPoints, formatVersion=2, validate=True)
lines = iter(glif.splitlines())
next(lines) # discard the first line containing the xml declaration
return "\n".join(lines)
# discard the first line containing the xml declaration
return "\n".join(islice(glif.splitlines(), 1, None))
def glifToPy(self, glif):
glif = stripText(glif)