convert old "%-formatted" and .format(...) strings into "f-strings" with flynt

5 files changed, 23 insertions, 29 deletions

diff --git a/creole/shared/base_emitter.py b/creole/shared/base_emitter.py
index a29c224..8113de1 100644
--- a/creole/shared/base_emitter.py
+++ b/creole/shared/base_emitter.py
@@ -38,7 +38,7 @@ class BaseEmitter(object):
     #--------------------------------------------------------------------------
 
     def blockdata_pass_emit(self, node):
-        return "%s\n\n" % node.content
+        return f"{node.content}\n\n"
         return node.content
 
     #--------------------------------------------------------------------------
@@ -57,11 +57,11 @@ class BaseEmitter(object):
             return self.deentity.replace_named(entity)
         except KeyError as err:
             if self.debugging:
-                print("unknown html entity found: %r" % entity)
-            return "&%s" % entity # FIXME
+                print(f"unknown html entity found: {entity!r}")
+            return f"&{entity}" # FIXME
         except UnicodeDecodeError as err:
             raise UnicodeError(
-                "Error handling entity %r: %s" % (entity, err)
+                f"Error handling entity {entity!r}: {err}"
             )
 
     def charref_emit(self, node):
@@ -98,7 +98,7 @@ class BaseEmitter(object):
 
     def li_emit(self, node):
         content = self.emit_children(node)
-        return "\n%s %s" % (self._inner_list, content)
+        return f"\n{self._inner_list} {content}"
 
     def _list_emit(self, node, list_type):
         start_newline = False
@@ -133,7 +133,7 @@ class BaseEmitter(object):
         )
         self.emit_children(node)
         content = self._table.get_table_markup()
-        return "%s\n" % content
+        return f"{content}\n"
 
     def tr_emit(self, node):
         self._table.add_tr()
@@ -167,7 +167,7 @@ class BaseEmitter(object):
         content = self.emit_children(node)
         content = self._escape_linebreaks(content)
         if node.kind in BLOCK_TAGS:
-            content = "%s\n\n" % content
+            content = f"{content}\n\n"
         return content
 
     def div_emit(self, node):
@@ -201,17 +201,15 @@ class BaseEmitter(object):
         def unicode_error(method_name, method, node, content):
             node.debug()
             raise AssertionError(
-                "Method '%s' (%s) returns no unicode - returns: %s (%s)" % (
-                    method_name, method, repr(content), type(content)
-                )
+                f"Method '{method_name}' ({method}) returns no unicode - returns: {repr(content)} ({type(content)})"
             )
 
         if node.level:
-            self.debug_msg("emit_node", "%s (level: %i): %r" % (node.kind, node.level, node.content))
+            self.debug_msg("emit_node", f"{node.kind} (level: {node.level:d}): {node.content!r}")
         else:
-            self.debug_msg("emit_node", "%s: %r" % (node.kind, node.content))
+            self.debug_msg("emit_node", f"{node.kind}: {node.content!r}")
 
-        method_name = "%s_emit" % node.kind
+        method_name = f"{node.kind}_emit"
         emit_method = getattr(self, method_name, None)
 
         if emit_method:
diff --git a/creole/shared/document_tree.py b/creole/shared/document_tree.py
index e5b7bcf..6198c8a 100644
--- a/creole/shared/document_tree.py
+++ b/creole/shared/document_tree.py
@@ -32,9 +32,7 @@ class DocNode:
 
         self.attrs = dict(attrs)
         if content:
-            assert isinstance(content, str), "Given content %r is not unicode, it's type: %s" % (
-                content, type(content)
-            )
+            assert isinstance(content, str), f"Given content {content!r} is not unicode, it's type: {type(content)}"
 
         self.content = content
         self.level = level
@@ -57,7 +55,7 @@ class DocNode:
         return str(self.__repr__())
 
     def __repr__(self):
-        return "<DocNode %s: %r>" % (self.kind, self.content)
+        return f"<DocNode {self.kind}: {self.content!r}>"
 #        return "<DocNode %s (parent: %r): %r>" % (self.kind, self.parent, self.content)
 
     def debug(self):
@@ -77,7 +75,7 @@ class DocNode:
         """
         print("_" * 80)
         print("\tDocNode - debug:")
-        print("str(): %s" % self)
+        print(f"str(): {self}")
         print("attributes:")
         for i in dir(self):
             if i.startswith("_") or i == "debug":
diff --git a/creole/shared/markup_table.py b/creole/shared/markup_table.py
index ec59e66..3cddccc 100644
--- a/creole/shared/markup_table.py
+++ b/creole/shared/markup_table.py
@@ -46,7 +46,7 @@ class MarkupTable(object):
                     if self.head_prefix and cell.startswith(self.head_prefix):
                         cell += " " # Headline
                     else:
-                        cell = " %s " % cell # normal cell
+                        cell = f" {cell} " # normal cell
                 line_cells.append(cell)
             cells.append(line_cells)
 
diff --git a/creole/shared/unknown_tags.py b/creole/shared/unknown_tags.py
index fe231f0..cf4aa4a 100644
--- a/creole/shared/unknown_tags.py
+++ b/creole/shared/unknown_tags.py
@@ -30,10 +30,10 @@ def _mask_content(emitter, node, mask_tag):
     content = emitter.emit_children(node)
     if not content:
         # single tag
-        return "<<%(mask_tag)s>><%(tag)s%(attrs)s /><</%(mask_tag)s>>" % tag_data
+        return f"<<{tag_data['mask_tag']}>><{tag_data['tag']}{tag_data['attrs']} /><</{tag_data['mask_tag']}>>"
 
-    start_tag = "<<%(mask_tag)s>><%(tag)s%(attrs)s><</%(mask_tag)s>>" % tag_data
-    end_tag = "<<%(mask_tag)s>></%(tag)s><</%(mask_tag)s>>" % tag_data
+    start_tag = f"<<{tag_data['mask_tag']}>><{tag_data['tag']}{tag_data['attrs']}><</{tag_data['mask_tag']}>>"
+    end_tag = f"<<{tag_data['mask_tag']}>></{tag_data['tag']}><</{tag_data['mask_tag']}>>"
 
     return start_tag + content + end_tag
 
@@ -47,9 +47,7 @@ def raise_unknown_node(emitter, node):
     """
     content = emitter.emit_children(node)
     raise NotImplementedError(
-        "Node from type '%s' is not implemented! (child content: %r)" % (
-            node.kind, content
-        )
+        f"Node from type '{node.kind}' is not implemented! (child content: {content!r})"
     )
 
 
@@ -89,10 +87,10 @@ def escape_unknown_nodes(emitter, node):
     content = emitter.emit_children(node)
     if not content:
         # single tag
-        return escape("<%(tag)s%(attrs)s />" % tag_data)
+        return escape(f"<{tag_data['tag']}{tag_data['attrs']} />")
 
-    start_tag = escape("<%(tag)s%(attrs)s>" % tag_data)
-    end_tag = escape("</%(tag)s>" % tag_data)
+    start_tag = escape(f"<{tag_data['tag']}{tag_data['attrs']}>")
+    end_tag = escape(f"</{tag_data['tag']}>")
 
     return start_tag + content + end_tag
 
diff --git a/creole/shared/utils.py b/creole/shared/utils.py
index cb55299..f80a8ef 100644
--- a/creole/shared/utils.py
+++ b/creole/shared/utils.py
@@ -79,7 +79,7 @@ def dict2string(d):
     attr_list = []
     for key, value in sorted(d.items()):
         value_string = json.dumps(value)
-        attr_list.append("%s=%s" % (key, value_string))
+        attr_list.append(f"{key}={value_string}")
     return " ".join(attr_list)