run pyupgrade: Many f-strings created ;)

26 files changed, 24 insertions, 64 deletions

diff --git a/creole/cmdline.py b/creole/cmdline.py
index 16ecb4e..f2761a4 100644
--- a/creole/cmdline.py
+++ b/creole/cmdline.py
@@ -1,5 +1,3 @@
-
-
 """
     python-creole commandline interface
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/creole/emitter/creol2html_emitter.py b/creole/emitter/creol2html_emitter.py
index 61e2e55..ea2ffc4 100644
--- a/creole/emitter/creol2html_emitter.py
+++ b/creole/emitter/creol2html_emitter.py
@@ -163,7 +163,7 @@ class HtmlEmitter:
         return '<hr />\n'
 
     def paragraph_emit(self, node):
-        return '<p>%s</p>\n' % self.emit_children(node)
+        return f'<p>{self.emit_children(node)}</p>\n'
 
     def _list_emit(self, node, list_type):
         if node.parent.kind in ("document",):
@@ -197,16 +197,16 @@ class HtmlEmitter:
         return self._list_emit(node, list_type="li")
 
     def table_emit(self, node):
-        return '<table>\n%s</table>\n' % self.emit_children(node)
+        return f'<table>\n{self.emit_children(node)}</table>\n'
 
     def table_row_emit(self, node):
-        return '<tr>\n%s</tr>\n' % self.emit_children(node)
+        return f'<tr>\n{self.emit_children(node)}</tr>\n'
 
     def table_cell_emit(self, node):
-        return '\t<td>%s</td>\n' % self.emit_children(node)
+        return f'\t<td>{self.emit_children(node)}</td>\n'
 
     def table_head_emit(self, node):
-        return '\t<th>%s</th>\n' % self.emit_children(node)
+        return f'\t<th>{self.emit_children(node)}</th>\n'
 
     # --------------------------------------------------------------------------
 
@@ -254,7 +254,7 @@ class HtmlEmitter:
         return header
 
     def preformatted_emit(self, node):
-        return '<pre>%s</pre>' % self.html_escape(node.content)
+        return f'<pre>{self.html_escape(node.content)}</pre>'
 
     def link_emit(self, node):
         target = node.content
@@ -377,11 +377,11 @@ class HtmlEmitter:
 
     def pre_block_emit(self, node):
         """ pre block, with newline at the end """
-        return "<pre>%s</pre>\n" % self.html_escape(node.content)
+        return f"<pre>{self.html_escape(node.content)}</pre>\n"
 
     def pre_inline_emit(self, node):
         """ pre without newline at the end """
-        return "<tt>%s</tt>" % self.html_escape(node.content)
+        return f"<tt>{self.html_escape(node.content)}</tt>"
 
     def default_emit(self, node):
         """Fallback function for emitting unknown nodes."""
diff --git a/creole/emitter/html2creole_emitter.py b/creole/emitter/html2creole_emitter.py
index ceac4fd..c5c5825 100644
--- a/creole/emitter/html2creole_emitter.py
+++ b/creole/emitter/html2creole_emitter.py
@@ -1,5 +1,3 @@
-
-
 """
     html -> creole Emitter
     ~~~~~~~~~~~~~~~~~~~~~~
diff --git a/creole/emitter/html2rest_emitter.py b/creole/emitter/html2rest_emitter.py
index e45210c..f686c16 100644
--- a/creole/emitter/html2rest_emitter.py
+++ b/creole/emitter/html2rest_emitter.py
@@ -1,5 +1,3 @@
-
-
 """
     html -> reStructuredText Emitter
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -65,7 +63,7 @@ class ReStructuredTextEmitter(BaseEmitter):
 
     def inlinedata_pre_emit(self, node):
         """ a pre inline block -> no newline at the end """
-        return "<pre>%s</pre>" % self.deentity.replace_all(node.content)
+        return f"<pre>{self.deentity.replace_all(node.content)}</pre>"
 
     def blockdata_pass_emit(self, node):
         return f"{node.content}\n\n"
@@ -88,19 +86,19 @@ class ReStructuredTextEmitter(BaseEmitter):
             # add rest at the end
             if not result.endswith("\n\n"):
                 result += "\n\n"
-            result += "%s\n\n" % self._get_block_data()
+            result += f"{self._get_block_data()}\n\n"
         return result
 
     def emit_node(self, node):
         result = ""
         if self._substitution_data and node.parent == self.root:
-            result += "%s\n\n" % self._get_block_data()
+            result += f"{self._get_block_data()}\n\n"
 
         result += super().emit_node(node)
         return result
 
     def p_emit(self, node):
-        return "%s\n\n" % self.emit_children(node)
+        return f"{self.emit_children(node)}\n\n"
 
     HEADLINE_DATA = {
         1: ("=", True),
@@ -255,7 +253,7 @@ class ReStructuredTextEmitter(BaseEmitter):
     # --------------------------------------------------------------------------
 
     def code_emit(self, node):
-        return "``%s``" % self._emit_content(node)
+        return f"``{self._emit_content(node)}``"
 
     # --------------------------------------------------------------------------
 
diff --git a/creole/emitter/html2textile_emitter.py b/creole/emitter/html2textile_emitter.py
index 785ed17..c0790e6 100644
--- a/creole/emitter/html2textile_emitter.py
+++ b/creole/emitter/html2textile_emitter.py
@@ -1,5 +1,3 @@
-
-
 """
     html -> textile Emitter
     ~~~~~~~~~~~~~~~~~~~~~~
@@ -35,11 +33,11 @@ class TextileEmitter(BaseEmitter):
 
     def blockdata_pre_emit(self, node):
         """ pre block -> with newline at the end """
-        return "<pre>%s</pre>\n" % self.deentity.replace_all(node.content)
+        return f"<pre>{self.deentity.replace_all(node.content)}</pre>\n"
 
     def inlinedata_pre_emit(self, node):
         """ a pre inline block -> no newline at the end """
-        return "<pre>%s</pre>" % self.deentity.replace_all(node.content)
+        return f"<pre>{self.deentity.replace_all(node.content)}</pre>"
 
     def blockdata_pass_emit(self, node):
         return f"{node.content}\n\n"
@@ -48,7 +46,7 @@ class TextileEmitter(BaseEmitter):
     # --------------------------------------------------------------------------
 
     def p_emit(self, node):
-        return "%s\n\n" % self.emit_children(node)
+        return f"{self.emit_children(node)}\n\n"
 
     def headline_emit(self, node):
         return f"h{node.level:d}. {self.emit_children(node)}\n\n"
diff --git a/creole/exceptions.py b/creole/exceptions.py
index 826ddbd..e8ff79c 100644
--- a/creole/exceptions.py
+++ b/creole/exceptions.py
@@ -1,5 +1,3 @@
-
-
 """
     python-creole exceptions
     ~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/creole/html_tools/strip_html.py b/creole/html_tools/strip_html.py
index be3d37e..d8dbac3 100644
--- a/creole/html_tools/strip_html.py
+++ b/creole/html_tools/strip_html.py
@@ -1,5 +1,3 @@
-
-
 """
     python-creole utils
     ~~~~~~~~~~~~~~~~~~~
diff --git a/creole/html_tools/text_tools.py b/creole/html_tools/text_tools.py
index c08b392..7963bd6 100644
--- a/creole/html_tools/text_tools.py
+++ b/creole/html_tools/text_tools.py
@@ -1,5 +1,3 @@
-
-
 """
     python-creole utils
     ~~~~~~~~~~~~~~~~~~~
diff --git a/creole/parser/html_parser.py b/creole/parser/html_parser.py
index d789a97..a3879a9 100644
--- a/creole/parser/html_parser.py
+++ b/creole/parser/html_parser.py
@@ -235,7 +235,7 @@ class HtmlParser(HTMLParser):
         if tag == "br":  # handled in starttag
             return
 
-        self.debug_msg("starttag", "%r" % self.get_starttag_text())
+        self.debug_msg("starttag", f"{self.get_starttag_text()!r}")
 
         if tag in ("ul", "ol"):
             self.__list_level -= 1
diff --git a/creole/rest_tools/clean_writer.py b/creole/rest_tools/clean_writer.py
index e8c224b..e55361d 100644
--- a/creole/rest_tools/clean_writer.py
+++ b/creole/rest_tools/clean_writer.py
@@ -131,7 +131,7 @@ class CleanHTMLTranslator(html4css1.HTMLTranslator):
         self.html_body.extend(
             self.body_prefix[1:] + self.body_pre_docinfo + self.docinfo + self.body + self.body_suffix[:-1]
         )
-        assert not self.context, 'len(context) = %s' % len(self.context)
+        assert not self.context, f'len(context) = {len(self.context)}'
 
     # __________________________________________________________________________
     # Clean table:
diff --git a/creole/rest_tools/pypi_rest2html.py b/creole/rest_tools/pypi_rest2html.py
index 50b2d54..368572e 100644
--- a/creole/rest_tools/pypi_rest2html.py
+++ b/creole/rest_tools/pypi_rest2html.py
@@ -1,5 +1,3 @@
-
-
 """
     Try to be so strict as PyPi.
 
@@ -19,7 +17,7 @@ from creole.exceptions import DocutilsImportError
 try:
     import docutils  # noqa flake8
     from docutils import io, readers
-    from docutils.core import publish_doctree, Publisher
+    from docutils.core import Publisher, publish_doctree
     from docutils.transforms import TransformError
 except ImportError as err:
     msg = (
diff --git a/creole/shared/base_emitter.py b/creole/shared/base_emitter.py
index a6e2819..4f7c5f4 100644
--- a/creole/shared/base_emitter.py
+++ b/creole/shared/base_emitter.py
@@ -81,7 +81,7 @@ class BaseEmitter:
     # --------------------------------------------------------------------------
 
     def p_emit(self, node):
-        return "%s\n\n" % self.emit_children(node)
+        return f"{self.emit_children(node)}\n\n"
 
     def br_emit(self, node):
         if self._inner_list != "":
@@ -111,7 +111,7 @@ class BaseEmitter:
         else:
             self._inner_list += list_type
 
-        content = "%s" % self.emit_children(node)
+        content = f"{self.emit_children(node)}"
 
         self._inner_list = self._inner_list[:-1]
 
diff --git a/creole/shared/document_tree.py b/creole/shared/document_tree.py
index fdcc863..7e22266 100644
--- a/creole/shared/document_tree.py
+++ b/creole/shared/document_tree.py
@@ -1,5 +1,3 @@
-
-
 """
     python-creole
     ~~~~~~~~~~~~~
diff --git a/creole/shared/example_macros.py b/creole/shared/example_macros.py
index 78f317c..635e920 100644
--- a/creole/shared/example_macros.py
+++ b/creole/shared/example_macros.py
@@ -35,7 +35,7 @@ def pre(text):
     Macro tag <<pre>>...<</pre>>.
     Put text between html pre tag.
     """
-    return '<pre>%s</pre>' % escape(text)
+    return f'<pre>{escape(text)}</pre>'
 
 
 def code(ext, text):
diff --git a/creole/shared/markup_table.py b/creole/shared/markup_table.py
index dd26374..444aae9 100644
--- a/creole/shared/markup_table.py
+++ b/creole/shared/markup_table.py
@@ -81,8 +81,8 @@ class MarkupTable:
         # preformat every table cell
         cells, widths = self._get_preformat_info()
 
-        separator_line = "+%s+" % "+".join(["-" * width for width in widths])
-        headline_separator = "+%s+" % "+".join(["=" * width for width in widths])
+        separator_line = f"+{'+'.join([('-' * width) for width in widths])}+"
+        headline_separator = f"+{'+'.join([('=' * width) for width in widths])}+"
 
         lines = []
         for no, row in enumerate(cells):
diff --git a/creole/shared/unknown_tags.py b/creole/shared/unknown_tags.py
index 8d36ad0..e08492f 100644
--- a/creole/shared/unknown_tags.py
+++ b/creole/shared/unknown_tags.py
@@ -1,5 +1,3 @@
-
-
 """
     python-creole
     ~~~~~~~~~~~~~
diff --git a/creole/tests/test_cli.py b/creole/tests/test_cli.py
index 76d8050..6c4fa84 100644
--- a/creole/tests/test_cli.py
+++ b/creole/tests/test_cli.py
@@ -1,5 +1,3 @@
-
-
 """
     unittest for CLI
     ~~~~~~~~~~~~~~~~
diff --git a/creole/tests/test_cross_compare_all.py b/creole/tests/test_cross_compare_all.py
index c09b550..cd85eef 100644
--- a/creole/tests/test_cross_compare_all.py
+++ b/creole/tests/test_cross_compare_all.py
@@ -1,5 +1,3 @@
-
-
 """
     cross compare unittest
     ~~~~~~~~~~~~~~~~~~~~~~
diff --git a/creole/tests/test_cross_compare_creole.py b/creole/tests/test_cross_compare_creole.py
index fe71397..396b2af 100644
--- a/creole/tests/test_cross_compare_creole.py
+++ b/creole/tests/test_cross_compare_creole.py
@@ -1,5 +1,3 @@
-
-
 """
     cross compare creole unittest
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/creole/tests/test_cross_compare_rest.py b/creole/tests/test_cross_compare_rest.py
index a475e06..1b891e2 100644
--- a/creole/tests/test_cross_compare_rest.py
+++ b/creole/tests/test_cross_compare_rest.py
@@ -1,5 +1,3 @@
-
-
 """
     cross compare reStructuredText unittest
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/creole/tests/test_cross_compare_textile.py b/creole/tests/test_cross_compare_textile.py
index b387806..7277537 100644
--- a/creole/tests/test_cross_compare_textile.py
+++ b/creole/tests/test_cross_compare_textile.py
@@ -1,5 +1,3 @@
-
-
 """
     cross compare textile unittest
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/creole/tests/test_html2creole.py b/creole/tests/test_html2creole.py
index 7cbad0d..452bc5d 100644
--- a/creole/tests/test_html2creole.py
+++ b/creole/tests/test_html2creole.py
@@ -1,5 +1,3 @@
-
-
 """
     html2creole tests
     ~~~~~~~~~~~~~~~~~
diff --git a/creole/tests/test_html2rest.py b/creole/tests/test_html2rest.py
index 13ac4ee..572816f 100644
--- a/creole/tests/test_html2rest.py
+++ b/creole/tests/test_html2rest.py
@@ -1,5 +1,3 @@
-
-
 """
     html2rest unittest
     ~~~~~~~~~~~~~~~~~~~~~
diff --git a/creole/tests/test_html2textile.py b/creole/tests/test_html2textile.py
index 318eca6..3da6805 100644
--- a/creole/tests/test_html2textile.py
+++ b/creole/tests/test_html2textile.py
@@ -1,5 +1,3 @@
-
-
 """
     html2textile unittest
     ~~~~~~~~~~~~~~~~~~~~~
diff --git a/creole/tests/test_rest2html.py b/creole/tests/test_rest2html.py
index 195e65e..87c8b3c 100644
--- a/creole/tests/test_rest2html.py
+++ b/creole/tests/test_rest2html.py
@@ -1,5 +1,3 @@
-
-
 """
     rest2html unittest
     ~~~~~~~~~~~~~~~~~~
diff --git a/creole/tests/test_utils.py b/creole/tests/test_utils.py
index c310aa1..061f2cd 100644
--- a/creole/tests/test_utils.py
+++ b/creole/tests/test_utils.py
@@ -1,5 +1,3 @@
-
-
 """
     unittest for some utils
     ~~~~~~~~~~~~~~~~~~~~~~~