From 125714173b5ef296f8d50191edcfceedcb19dbde Mon Sep 17 00:00:00 2001 From: Deepanshu Gupta Date: Tue, 10 Jun 2014 14:43:23 -0700 Subject: Remove lxml dependency. The encoding for the .ttx file generated is now hard-coded to be utf-8. Change-Id: I71c208327995651fcf44b6961510f84bafb05848 --- tools/layoutlib/rename_font/build_font.py | 5 ++--- tools/layoutlib/rename_font/test.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/layoutlib/rename_font/build_font.py b/tools/layoutlib/rename_font/build_font.py index aea32418f7f0..bd9b14c39161 100755 --- a/tools/layoutlib/rename_font/build_font.py +++ b/tools/layoutlib/rename_font/build_font.py @@ -27,7 +27,7 @@ import sys from fontTools import ttx import re import os -from lxml import etree +import xml.etree.ElementTree as etree import shutil import glob from multiprocessing import Pool @@ -84,14 +84,13 @@ def convert_font(input_path): ttx.main(ttx_args) # now parse the xml file to change its PS name. tree = etree.parse(ttx_path) - encoding = tree.docinfo.encoding root = tree.getroot() for name in root.iter('name'): [old_ps_name, version] = get_font_info(name) if old_ps_name is not None and version is not None: new_ps_name = old_ps_name + version update_name(name, new_ps_name) - tree.write(ttx_path, xml_declaration=True, encoding=encoding ) + tree.write(ttx_path, xml_declaration=True, encoding='utf-8' ) # generate the udpated font now. ttx_args = ['-q', '-d', dest_dir, ttx_path] ttx.main(ttx_args) diff --git a/tools/layoutlib/rename_font/test.py b/tools/layoutlib/rename_font/test.py index d4c86cb6a23e..b0b69d811833 100755 --- a/tools/layoutlib/rename_font/test.py +++ b/tools/layoutlib/rename_font/test.py @@ -14,7 +14,7 @@ import build_font from fontTools import ttx import os -from lxml import etree +import xml.etree.ElementTree as etree import shutil import tempfile -- cgit v1.2.3-59-g8ed1b