diff options
Diffstat (limited to 'creole/emitter')
| -rw-r--r-- | creole/emitter/creol2html_emitter.py | 17 | ||||
| -rw-r--r-- | creole/emitter/html2creole_emitter.py | 11 | ||||
| -rw-r--r-- | creole/emitter/html2rest_emitter.py | 11 | ||||
| -rw-r--r-- | creole/emitter/html2textile_emitter.py | 5 |
4 files changed, 19 insertions, 25 deletions
diff --git a/creole/emitter/creol2html_emitter.py b/creole/emitter/creol2html_emitter.py index f946c88..61e2e55 100644 --- a/creole/emitter/creol2html_emitter.py +++ b/creole/emitter/creol2html_emitter.py @@ -1,4 +1,3 @@ - """ WikiCreole to HTML converter @@ -16,7 +15,7 @@ from creole.parser.creol2html_parser import CreoleParser from creole.shared.utils import string2dict -class TableOfContent(object): +class TableOfContent: def __init__(self): self.max_depth = None self.headlines = [] @@ -91,7 +90,7 @@ class TableOfContent(object): return document -class HtmlEmitter(object): +class HtmlEmitter: """ Generate HTML output for the document tree consisting of DocNodes. @@ -212,10 +211,10 @@ class HtmlEmitter(object): # -------------------------------------------------------------------------- def _typeface(self, node, tag): - return '<%(tag)s>%(data)s</%(tag)s>' % { - "tag": tag, - "data": self.emit_children(node), - } + return '<{tag}>{data}</{tag}>'.format( + tag=tag, + data=self.emit_children(node), + ) # TODO: How can we generalize that: def emphasis_emit(self, node): @@ -278,7 +277,7 @@ class HtmlEmitter(object): w_str, h_str = size_str.split("x", 1) width = int(w_str.strip()) height = int(h_str.strip()) - return '<img src="%s" title="%s" alt="%s" width="%s" height="%s" />' % ( + return '<img src="{}" title="{}" alt="{}" width="{}" height="{}" />'.format( self.attr_escape(target), title, title, width, height) except BaseException: pass @@ -339,7 +338,7 @@ class HtmlEmitter(object): else: try: sourceline = inspect.getsourcelines(macro)[0][0].strip() - except IOError as err: + except OSError as err: evalue = etype(f"{evalue} (error getting sourceline: {err} from {filename})") else: evalue = etype(f"{evalue} (sourceline: {sourceline!r} from {filename})") diff --git a/creole/emitter/html2creole_emitter.py b/creole/emitter/html2creole_emitter.py index 7c6421e..ceac4fd 100644 --- a/creole/emitter/html2creole_emitter.py +++ b/creole/emitter/html2creole_emitter.py @@ -1,5 +1,4 @@ -#!/usr/bin/env python -# coding: utf-8 + """ html -> creole Emitter @@ -24,7 +23,7 @@ class CreoleEmitter(BaseEmitter): def __init__(self, document_tree, strict=False, *args, **kwargs): self.strict = strict - super(CreoleEmitter, self).__init__(document_tree, *args, **kwargs) + super().__init__(document_tree, *args, **kwargs) self.table_head_prefix = "= " self.table_auto_width = True @@ -62,7 +61,7 @@ class CreoleEmitter(BaseEmitter): return "\n" def headline_emit(self, node): - return "%s %s\n\n" % ("=" * node.level, self.emit_children(node)) + return f"{'=' * node.level} {self.emit_children(node)}\n\n" # -------------------------------------------------------------------------- @@ -131,9 +130,9 @@ class CreoleEmitter(BaseEmitter): if not self.strict: if width and height: - return "{{%s|%s|%sx%s}}" % (src, text, width, height) + return f"{{{{{src}|{text}|{width}x{height}}}}}" - return "{{%s|%s}}" % (src, text) + return f"{{{{{src}|{text}}}}}" # -------------------------------------------------------------------------- diff --git a/creole/emitter/html2rest_emitter.py b/creole/emitter/html2rest_emitter.py index f8e2322..e45210c 100644 --- a/creole/emitter/html2rest_emitter.py +++ b/creole/emitter/html2rest_emitter.py @@ -1,5 +1,4 @@ -#!/usr/bin/env python -# coding: utf-8 + """ html -> reStructuredText Emitter @@ -35,7 +34,7 @@ class ReStructuredTextEmitter(BaseEmitter): """ def __init__(self, *args, **kwargs): - super(ReStructuredTextEmitter, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.table_head_prefix = "_. " self.table_auto_width = False @@ -97,7 +96,7 @@ class ReStructuredTextEmitter(BaseEmitter): if self._substitution_data and node.parent == self.root: result += "%s\n\n" % self._get_block_data() - result += super(ReStructuredTextEmitter, self).emit_node(node) + result += super().emit_node(node) return result def p_emit(self, node): @@ -262,9 +261,7 @@ class ReStructuredTextEmitter(BaseEmitter): def li_emit(self, node): content = self.emit_children(node).strip("\n") - result = "\n%s%s %s\n" % ( - " " * (node.level - 1), self._list_markup, content - ) + result = f"\n{' ' * (node.level - 1)}{self._list_markup} {content}\n" return result def _list_emit(self, node, list_type): diff --git a/creole/emitter/html2textile_emitter.py b/creole/emitter/html2textile_emitter.py index 3cbbd02..785ed17 100644 --- a/creole/emitter/html2textile_emitter.py +++ b/creole/emitter/html2textile_emitter.py @@ -1,5 +1,4 @@ -#!/usr/bin/env python -# coding: utf-8 + """ html -> textile Emitter @@ -23,7 +22,7 @@ class TextileEmitter(BaseEmitter): """ def __init__(self, *args, **kwargs): - super(TextileEmitter, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.table_head_prefix = "_. " self.table_auto_width = False |