Fix merge conflict
This commit is contained in:
parent
5b40c4f257
commit
22391398b0
@ -100,7 +100,7 @@ class ProgramTest(unittest.TestCase):
|
|||||||
assert BYTECODE == p.getBytecode()
|
assert BYTECODE == p.getBytecode()
|
||||||
|
|
||||||
def test_xml_indentation(self):
|
def test_xml_indentation(self):
|
||||||
with open(TTPROGRAM_TTX, 'r') as f:
|
with open(TTPROGRAM_TTX, 'r', encoding='utf-8') as f:
|
||||||
ttProgramXML = f.read()
|
ttProgramXML = f.read()
|
||||||
p = Program()
|
p = Program()
|
||||||
p.fromBytecode(BYTECODE)
|
p.fromBytecode(BYTECODE)
|
||||||
@ -111,7 +111,6 @@ class ProgramTest(unittest.TestCase):
|
|||||||
p.toXML(writer, ttfont)
|
p.toXML(writer, ttfont)
|
||||||
finally:
|
finally:
|
||||||
output_string = buf.getvalue()
|
output_string = buf.getvalue()
|
||||||
buf.close()
|
|
||||||
assert output_string == ttProgramXML
|
assert output_string == ttProgramXML
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user