code cleanup

6 files changed, 3 insertions, 122 deletions

diff --git a/.isort.cfg b/.isort.cfg
index c97c6cc..42c949b 100644
--- a/.isort.cfg
+++ b/.isort.cfg
@@ -11,6 +11,7 @@ case_sensitive=false
 multi_line_output=3
 include_trailing_comma=true
 
+known_external=poetry-publish
 known_first_party=creole
 
 no_lines_before=LOCALFOLDER
diff --git a/Makefile b/Makefile
index fc38d47..76eb81f 100644
--- a/Makefile
+++ b/Makefile
@@ -39,8 +39,8 @@ lint: ## Run code formatters and linter
 fix-code-style: ## Fix code formatting
 	poetry run flynt --line_length=${MAX_LINE_LENGTH} .
 	poetry run pyupgrade --exit-zero-even-if-changed --py3-plus --py36-plus --py37-plus `find . -name "*.py" -type f -not -path "./.tox/*"`
-	poetry run isort .
 	poetry run autopep8 --aggressive --aggressive --in-place --recursive .
+	poetry run isort .
 
 tox-listenvs: check-poetry ## List all tox test environments
 	poetry run tox --listenvs
diff --git a/creole/emitter/creol2html_emitter.py b/creole/emitter/creol2html_emitter.py
index ea2ffc4..e8689b3 100644
--- a/creole/emitter/creol2html_emitter.py
+++ b/creole/emitter/creol2html_emitter.py
@@ -277,8 +277,7 @@ class HtmlEmitter:
                     w_str, h_str = size_str.split("x", 1)
                     width = int(w_str.strip())
                     height = int(h_str.strip())
-                    return '<img src="{}" title="{}" alt="{}" width="{}" height="{}" />'.format(
-                        self.attr_escape(target), title, title, width, height)
+                    return f'<img src="{self.attr_escape(target)}" title="{title}" alt="{title}" width="{width}" height="{height}" />'
             except BaseException:
                 pass
         return f'<img src="{self.attr_escape(target)}" title="{text}" alt="{text}" />'
diff --git a/creole/emitter/html2creole_emitter.py b/creole/emitter/html2creole_emitter.py
index c5c5825..d745fe3 100644
--- a/creole/emitter/html2creole_emitter.py
+++ b/creole/emitter/html2creole_emitter.py
@@ -42,7 +42,6 @@ class CreoleEmitter(BaseEmitter):
 
     def blockdata_pass_emit(self, node):
         return f"{node.content}\n\n"
-        return node.content
 
     # --------------------------------------------------------------------------
 
@@ -147,32 +146,3 @@ class CreoleEmitter(BaseEmitter):
 
     def span_emit(self, node):
         return self._emit_content(node)
-
-
-if __name__ == '__main__':
-    import doctest
-    print(doctest.testmod())
-
-#    import sys;sys.exit()
-    from creole.parser.html_parser import HtmlParser
-
-    data = """A <<unittest_macro1 args="foo1">>bar1<</unittest_macro1>> in a line..."""
-
-#    print(data.strip())
-    h2c = HtmlParser(
-        debug=True
-    )
-    document_tree = h2c.feed(data)
-    h2c.debug()
-
-    from creole.shared.unknown_tags import escape_unknown_nodes
-
-    e = CreoleEmitter(document_tree,
-                      debug=True,
-                      unknown_emit=escape_unknown_nodes
-                      )
-    content = e.emit()
-    print("*" * 79)
-    print(content)
-    print("*" * 79)
-    print(content.replace(" ", ".").replace("\n", "\\n\n"))
diff --git a/creole/emitter/html2rest_emitter.py b/creole/emitter/html2rest_emitter.py
index f686c16..d2d9042 100644
--- a/creole/emitter/html2rest_emitter.py
+++ b/creole/emitter/html2rest_emitter.py
@@ -67,7 +67,6 @@ class ReStructuredTextEmitter(BaseEmitter):
 
     def blockdata_pass_emit(self, node):
         return f"{node.content}\n\n"
-        return node.content
 
     # --------------------------------------------------------------------------
 
@@ -291,52 +290,3 @@ class ReStructuredTextEmitter(BaseEmitter):
         self.emit_children(node)
         content = self._table.get_rest_table()
         return f"{content}\n\n"
-
-
-if __name__ == '__main__':
-    import doctest
-    print(doctest.testmod())
-
-#    import sys;sys.exit()
-    from creole.parser.html_parser import HtmlParser
-
-    data = """<p>A nested bullet lists:</p>
-<ul>
-<li><p>item 1</p>
-<ul>
-<li><p>A <strong>bold subitem 1.1</strong> here.</p>
-<ul>
-<li>subsubitem 1.1.1</li>
-<li>subsubitem 1.1.2 with inline <img alt="substitution text" src="/url/to/image.png" /> image.</li>
-</ul>
-</li>
-<li><p>subitem 1.2</p>
-</li>
-</ul>
-</li>
-<li><p>item 2</p>
-<ul>
-<li>subitem 2.1</li>
-</ul>
-</li>
-</ul>
-<p>Text under list.</p>
-<p>4 <img alt="PNG pictures" src="/image.png" /> four</p>
-<p>5 <img alt="Image without files ext?" src="/path1/path2/image" /> five</p>
-"""
-
-    print(data)
-    h2c = HtmlParser(
-        #        debug=True
-    )
-    document_tree = h2c.feed(data)
-    h2c.debug()
-
-    e = ReStructuredTextEmitter(document_tree,
-                                debug=True
-                                )
-    content = e.emit()
-    print("*" * 79)
-    print(content)
-    print("*" * 79)
-    print(content.replace(" ", ".").replace("\n", "\\n\n"))
diff --git a/creole/emitter/html2textile_emitter.py b/creole/emitter/html2textile_emitter.py
index c0790e6..89623d4 100644
--- a/creole/emitter/html2textile_emitter.py
+++ b/creole/emitter/html2textile_emitter.py
@@ -41,7 +41,6 @@ class TextileEmitter(BaseEmitter):
 
     def blockdata_pass_emit(self, node):
         return f"{node.content}\n\n"
-        return node.content
 
     # --------------------------------------------------------------------------
 
@@ -125,41 +124,3 @@ class TextileEmitter(BaseEmitter):
 
     def ol_emit(self, node):
         return self._list_emit(node, list_type="#")
-
-
-if __name__ == '__main__':
-    import doctest
-    print(doctest.testmod())
-
-#    import sys;sys.exit()
-    from creole.parser.html_parser import HtmlParser
-
-    data = """
-<h1>Textile</h1>
-<table>
-<tr>
-    <th>Headline 1</th>
-    <th>Headline 2</th>
-</tr>
-<tr>
-    <td>cell one</td>
-    <td>cell two</td>
-</tr>
-</table>
-"""
-
-#    print(data.strip())
-    h2c = HtmlParser(
-        debug=True
-    )
-    document_tree = h2c.feed(data)
-    h2c.debug()
-
-    e = TextileEmitter(document_tree,
-                       debug=True
-                       )
-    content = e.emit()
-    print("*" * 79)
-    print(content)
-    print("*" * 79)
-    print(content.replace(" ", ".").replace("\n", "\\n\n"))