From bb62d2d8e3865d2eac72f12f6dc09366e811e0b8 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 7 Feb 2015 18:36:19 +0000 Subject: Rename html_string to as_string --- mammoth/conversion.py | 2 +- mammoth/html_generation.py | 4 ++-- tests/html_generation_tests.py | 36 ++++++++++++++++++------------------ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/mammoth/conversion.py b/mammoth/conversion.py index 922626c..7ea3998 100644 --- a/mammoth/conversion.py +++ b/mammoth/conversion.py @@ -28,7 +28,7 @@ def convert_document_element_to_html(element, id_prefix=id_prefix) converter.convert_element_to_html(element, html_generator,) html_generator.end_all() - return results.Result(html_generator.html_string(), converter.messages) + return results.Result(html_generator.as_string(), converter.messages) class DocumentConverter(object): diff --git a/mammoth/html_generation.py b/mammoth/html_generation.py index 9f7930f..f91d4e8 100644 --- a/mammoth/html_generation.py +++ b/mammoth/html_generation.py @@ -41,12 +41,12 @@ class HtmlGenerator(object): self._writer.start(element.name, element.attributes) def append(self, other): - other_string = other.html_string() + other_string = other.as_string() if other_string: self._write_all() self._writer.append(other_string) - def html_string(self): + def as_string(self): return self._writer.as_string() diff --git a/tests/html_generation_tests.py b/tests/html_generation_tests.py index 25b4803..e715bdf 100644 --- a/tests/html_generation_tests.py +++ b/tests/html_generation_tests.py @@ -7,21 +7,21 @@ from mammoth import html_paths @istest def generates_empty_string_when_newly_created(): generator = HtmlGenerator() - assert_equal("", generator.html_string()) + assert_equal("", generator.as_string()) @istest def html_escapes_text(): generator = HtmlGenerator() generator.text("<") - assert_equal("<", generator.html_string()) + assert_equal("<", generator.as_string()) @istest def self_closing_tag_is_self_closing(): generator = HtmlGenerator() generator.self_closing("br") - assert_equal("
", generator.html_string()) + assert_equal("
", generator.as_string()) @istest @@ -31,7 +31,7 @@ def all_elements_are_closed_by_end_all(): generator.start("span") generator.text("Hello!") generator.end_all() - assert_equal("

Hello!

", generator.html_string()) + assert_equal("

Hello!

", generator.as_string()) @istest @@ -40,7 +40,7 @@ def elements_with_no_text_are_not_generator(): generator.start("p") generator.start("span") generator.end_all() - assert_equal("", generator.html_string()) + assert_equal("", generator.as_string()) @istest @@ -50,21 +50,21 @@ def elements_with_empty_string_text_are_not_generator(): generator.start("span") generator.text("") generator.end_all() - assert_equal("", generator.html_string()) + assert_equal("", generator.as_string()) @istest def self_closing_tag_can_have_attributes(): generator = HtmlGenerator() generator.self_closing("br", {"data-blah": "42"}) - assert_equal('
', generator.html_string()) + assert_equal('
', generator.as_string()) @istest def attribute_values_are_escaped(): generator = HtmlGenerator() generator.self_closing("br", {"data-blah": "<"}) - assert_equal('
', generator.html_string()) + assert_equal('
', generator.as_string()) @istest @@ -73,7 +73,7 @@ def opening_tag_can_have_attributes(): generator.start("p", {"data-blah": "42"}) generator.text("Hello!") generator.end() - assert_equal('

Hello!

', generator.html_string()) + assert_equal('

Hello!

', generator.as_string()) @istest @@ -81,7 +81,7 @@ def appending_another_html_generator_does_nothing_if_empty(): generator = HtmlGenerator() generator.start("p") generator.append(HtmlGenerator()) - assert_equal('', generator.html_string()) + assert_equal('', generator.as_string()) @istest @@ -91,7 +91,7 @@ def appending_another_html_generator_writes_out_elements_if_other_generator_is_n other = HtmlGenerator() other.text("Hello!") generator.append(other) - assert_equal('

Hello!', generator.html_string()) + assert_equal('

Hello!', generator.as_string()) @istest @@ -102,7 +102,7 @@ class SatisfyPathTests(object): path = html_paths.path([html_paths.element(["p"])]) satisfy_html_path(generator, path) generator.text("Hello!") - assert_equal('

Hello!', generator.html_string()) + assert_equal('

Hello!', generator.as_string()) @istest @@ -113,7 +113,7 @@ class SatisfyPathTests(object): path = html_paths.path([html_paths.element(["blockquote"]), html_paths.element(["p"])]) satisfy_html_path(generator, path) generator.text("there") - assert_equal('

Hello

there', generator.html_string()) + assert_equal('

Hello

there', generator.as_string()) @istest @@ -125,7 +125,7 @@ class SatisfyPathTests(object): path = html_paths.path([html_paths.element(["blockquote"]), html_paths.element(["p"])]) satisfy_html_path(generator, path) generator.text("there") - assert_equal('

Hello

there', generator.html_string()) + assert_equal('

Hello

there', generator.as_string()) @istest @@ -137,7 +137,7 @@ class SatisfyPathTests(object): path = html_paths.path([html_paths.element(["blockquote"]), html_paths.element(["p"], fresh=True)]) satisfy_html_path(generator, path) generator.text("there") - assert_equal('

Hello

there', generator.html_string()) + assert_equal('

Hello

there', generator.as_string()) @istest @@ -146,7 +146,7 @@ class SatisfyPathTests(object): path = html_paths.path([html_paths.element(["p"], class_names=["tip"])]) satisfy_html_path(generator, path) generator.text("Hello") - assert_equal('

Hello', generator.html_string()) + assert_equal('

Hello', generator.as_string()) @istest @@ -157,7 +157,7 @@ class SatisfyPathTests(object): path = html_paths.path([html_paths.element(["p"], class_names=["tip"])]) satisfy_html_path(generator, path) generator.text("Tip") - assert_equal('

Help

Tip', generator.html_string()) + assert_equal('

Help

Tip', generator.as_string()) @istest @@ -168,4 +168,4 @@ class SatisfyPathTests(object): path = html_paths.path([html_paths.element(["p"], class_names=["tip"])]) satisfy_html_path(generator, path) generator.text("Tip") - assert_equal('

HelpTip', generator.html_string()) + assert_equal('

HelpTip', generator.as_string()) -- cgit v1.2.3