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

glifLib: strip comments when parsing with lxml

Browse Source 
they are already ignored when parsing via built-in ElementTree
This commit is contained in:
Cosimo Lupo 2019-12-16 12:05:13 +00:00
parent 70c3eccb4e
commit 337bb66211
No known key found for this signature in database
GPG Key ID: 20D4A261E4A0E642
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/fontTools/ufoLib/glifLib.py
View File

@ -852,7 +852,11 @@ def validateLayerInfoVersion3Data(infoData):
# ----------------- # -----------------
def _glifTreeFromFile(aFile): def _glifTreeFromFile(aFile):
root = etree.parse(aFile).getroot() if etree._have_lxml:
tree = etree.parse(aFile, parser=etree.XMLParser(remove_comments=True))
else:
tree = etree.parse(aFile)
root = tree.getroot()
if root.tag != "glyph": if root.tag != "glyph":
raise GlifLibError("The GLIF is not properly formatted.") raise GlifLibError("The GLIF is not properly formatted.")
if root.text and root.text.strip() != '': if root.text and root.text.strip() != '':
@ -862,7 +866,10 @@ def _glifTreeFromFile(aFile):
def _glifTreeFromString(aString): def _glifTreeFromString(aString):
data = tobytes(aString, encoding="utf-8") data = tobytes(aString, encoding="utf-8")
root = etree.fromstring(data) if etree._have_lxml:
root = etree.fromstring(data, parser=etree.XMLParser(remove_comments=True))
else:
root = etree.fromstring(data)
if root.tag != "glyph": if root.tag != "glyph":
raise GlifLibError("The GLIF is not properly formatted.") raise GlifLibError("The GLIF is not properly formatted.")
if root.text and root.text.strip() != '': if root.text and root.text.strip() != '':