From dc6e96be9801261c4ca3d9e90cf9dcb24b8666af Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sun, 13 Sep 2015 15:29:07 +0100
Subject: Remove support for convert_underline

---
 mammoth/conversion.py     |  7 ++-----
 tests/conversion_tests.py | 10 ----------
 tests/mammoth_tests.py    |  7 -------
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/mammoth/conversion.py b/mammoth/conversion.py
index fb7a9c3..e1e7550 100644
--- a/mammoth/conversion.py
+++ b/mammoth/conversion.py
@@ -12,7 +12,6 @@ from .docx.files import InvalidFileReferenceError
 def convert_document_element_to_html(element,
         style_map=None,
         convert_image=None,
-        convert_underline=None,
         id_prefix=None,
         output_format=None,
         ignore_empty_paragraphs=True):
@@ -31,7 +30,6 @@ def convert_document_element_to_html(element,
         messages=messages,
         style_map=style_map,
         convert_image=convert_image,
-        convert_underline=convert_underline,
         id_prefix=id_prefix,
         ignore_empty_paragraphs=ignore_empty_paragraphs,
         note_references=[])
@@ -52,13 +50,12 @@ def _generate_image_attributes(image):
 
 
 class _DocumentConverter(documents.ElementVisitor):
-    def __init__(self, messages, style_map, convert_image, convert_underline, id_prefix, ignore_empty_paragraphs, note_references):
+    def __init__(self, messages, style_map, convert_image, id_prefix, ignore_empty_paragraphs, note_references):
         self._messages = messages
         self._style_map = style_map
         self._id_prefix = id_prefix
         self._ignore_empty_paragraphs = ignore_empty_paragraphs
         self._note_references = note_references
-        self._convert_underline = convert_underline or self._default_convert_underline
         self._convert_image = convert_image
     
     def visit_image(self, image):
@@ -109,7 +106,7 @@ class _DocumentConverter(documents.ElementVisitor):
         return nodes
     
     
-    def _default_convert_underline(self, nodes):
+    def _convert_underline(self, nodes):
         return self._find_style_for_run_property("underline").wrap(nodes)
     
     
diff --git a/tests/conversion_tests.py b/tests/conversion_tests.py
index cb6f961..cc7f97b 100644
--- a/tests/conversion_tests.py
+++ b/tests/conversion_tests.py
@@ -6,7 +6,6 @@ import io
 
 from nose.tools import istest, assert_equal
 
-import mammoth
 from mammoth import documents, style_reader, results, html
 from mammoth.conversion import convert_document_element_to_html
 from mammoth.docx.xmlparser import parse_xml
@@ -189,15 +188,6 @@ def underline_runs_are_ignored_by_default():
     assert_equal("Hello", result.value)
     
 
-@istest
-def underline_runs_can_be_wrapped_in_tags_using_convert_underline_argument():
-    result = convert_document_element_to_html(
-        documents.run(children=[documents.text("Hello")], is_underline=True),
-        convert_underline=mammoth.underline.element("u")
-    )
-    assert_equal("<u>Hello</u>", result.value)
-    
-
 @istest
 def underline_runs_can_be_mapped_using_style_mapping():
     result = convert_document_element_to_html(
diff --git a/tests/mammoth_tests.py b/tests/mammoth_tests.py
index 677a97b..1b97a1a 100644
--- a/tests/mammoth_tests.py
+++ b/tests/mammoth_tests.py
@@ -198,13 +198,6 @@ def underline_is_ignored_by_default():
         assert_equal('<p><strong>The Sunset Tree</strong></p>', result.value)
 
 
-@istest
-def underline_can_be_configured_with_convert_underline_option():
-    with open(test_path("underline.docx"), "rb") as fileobj:
-        result = mammoth.convert_to_html(fileobj=fileobj, convert_underline=mammoth.underline.element("em"))
-        assert_equal('<p><strong>The <em>Sunset</em> Tree</strong></p>', result.value)
-
-
 @istest
 def underline_can_be_configured_with_style_mapping():
     with open(test_path("underline.docx"), "rb") as fileobj:
-- 
cgit v1.2.3