From 673f1c46b7c3dbf0494612056fe3c86da9e0dc0a Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 14 Dec 2013 17:54:05 +0000 Subject: Parse outputted HTML in test to avoid reliance on attribute order --- mammoth/html_generation.py | 2 +- tests/conversion_tests.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mammoth/html_generation.py b/mammoth/html_generation.py index 9716ac2..f6f62af 100644 --- a/mammoth/html_generation.py +++ b/mammoth/html_generation.py @@ -45,7 +45,7 @@ class HtmlGenerator(object): self._fragments.append(fragment) def html_string(self): - return "".join(self._fragments) + return u"".join(self._fragments) class _Element(object): diff --git a/tests/conversion_tests.py b/tests/conversion_tests.py index cb9b064..a041561 100644 --- a/tests/conversion_tests.py +++ b/tests/conversion_tests.py @@ -4,6 +4,7 @@ from nose.tools import istest, assert_equal from mammoth import documents, style_reader, results from mammoth.conversion import convert_document_element_to_html +from mammoth.docx.xmlparser import parse_xml @istest @@ -154,14 +155,15 @@ def images_are_converted_to_img_tags_with_data_uri(): def images_have_alt_tags_if_available(): image = documents.image(alt_text="It's a hat", content_type="image/png", open=lambda: io.BytesIO(b"abc")) result = convert_document_element_to_html(image) - assert_equal('It\'s a hat', result.value) + image_html = parse_xml(io.StringIO(result.value)) + assert_equal('It\'s a hat', image_html.attributes["alt"]) @istest def can_define_custom_conversion_for_images(): def convert_image(image, html_generator): with image.open() as image_file: - html_generator.self_closing("img", {"alt": image_file.read()}) + html_generator.self_closing("img", {"alt": image_file.read().decode("ascii")}) image = documents.image(alt_text=None, content_type="image/png", open=lambda: io.BytesIO(b"abc")) result = convert_document_element_to_html(image, convert_image=convert_image) -- cgit v1.2.3