lol
', # Progress bars. '[progress=lol]mdr[/progress]': '[progress=lol]mdr[/progress]
', @@ -206,6 +210,6 @@ exec("class TextoutHTMLTest(_unittest.TestCase):\n maxDiff = None\n" + \ # If run as main script, run the test function. if __name__ == '__main__': - çunittest.main() + _unittest.main() # End of file. diff --git a/textoutpc/_translate.py b/textoutpc/_translate.py index 72f422a..4c33ce2 100755 --- a/textoutpc/_translate.py +++ b/textoutpc/_translate.py @@ -400,6 +400,9 @@ class Translator: `end` represents the full version of the ending tag marker, for displaying if the tag is invalid. """ + if not self.queue: + return + # Even if we had no beginning, no content and no end, what is # here has to be distinguished from what was right before! # So we need to flush the text group for this. diff --git a/textoutpc/builtin/_Align.py b/textoutpc/builtin/_Align.py index b23df83..800c3ca 100755 --- a/textoutpc/builtin/_Align.py +++ b/textoutpc/builtin/_Align.py @@ -8,10 +8,11 @@ from .. import BlockTag as _BlockTag __all__ = ["AlignTag"] + class AlignTag(_BlockTag): """ Main tag for aligning paragraphs. Example uses: - + [align=center]This text is centered horizontally.[/align] [justify]This text is justified.[/justify] """ @@ -31,7 +32,7 @@ class AlignTag(_BlockTag): if not name: align = None - elif name == 'align' and value != None: + elif name == 'align' and value is not None: align = _align[value] else: align = _align[name[1:-1]] diff --git a/textoutpc/builtin/_Code.py b/textoutpc/builtin/_Code.py index 2787993..37eb4d5 100755 --- a/textoutpc/builtin/_Code.py +++ b/textoutpc/builtin/_Code.py @@ -8,10 +8,11 @@ from .. import BlockTag as _BlockTag, InlineTag as _InlineTag __all__ = ["CodeTag", "InlineCodeTag", "NoEvalTag"] + class CodeTag(_BlockTag): """ The basic code tag, for displaying code. Example uses: - + [code]int main() { printf("hello, world"); @@ -34,11 +35,12 @@ class CodeTag(_BlockTag): def end_lightscript(self): return '```\n' + class InlineCodeTag(_InlineTag): """ Inline code tag, doesn't display a box, simply doesn't evaluate the content and uses monospace font. Example uses: - + `some inline code` [inlinecode][b]The tags will be shown verbatim.[/b][/inlinecode] [inlinecode][inlinecode][i]This also[/inlinecode] works![/inlinecode] @@ -60,10 +62,11 @@ class InlineCodeTag(_InlineTag): def end_lightscript(self): return '`' + class NoEvalTag(_InlineTag): """ Inline code tag, simply doesn't evaluate the content. Example uses: - + [noeval][b]wow, and no need for monospace![/b][/noeval] """ diff --git a/textoutpc/builtin/_Image.py b/textoutpc/builtin/_Image.py index 6f9eb32..2fd6a78 100755 --- a/textoutpc/builtin/_Image.py +++ b/textoutpc/builtin/_Image.py @@ -9,10 +9,11 @@ from html import escape as _htmlescape __all__ = ["ImageTag", "AdminImageTag"] + class ImageTag(_BlockTag): """ The main tag for displaying an image. Example uses: - + [img]picture_url[/img] [img=center]picture_url[/img] [img=12x24]picture_url[/img] @@ -41,7 +42,7 @@ class ImageTag(_BlockTag): self._height = None self._align = None - for arg in ("", value)[value != None].split('|'): + for arg in ("", value)[value is not None].split('|'): if not arg: pass elif arg[0] in '0123456789x': @@ -49,13 +50,17 @@ class ImageTag(_BlockTag): self._height = None dim = arg.split('x') - try: self._width = int(dim[0]) - except: pass - try: self._height = int(dim[1]) - except: pass + try: + self._width = int(dim[0]) + except ValueError: + pass + try: + self._height = int(dim[1]) + except ValueError: + pass elif arg in _align: al, fl = _align[arg] - if al != None: + if al is not None: self._align = al if fl: self._float = True @@ -95,12 +100,13 @@ class ImageTag(_BlockTag): url = self._url.replace('[', '%5B').replace(']', '%5D') return '[[image:{}]]'.format(url) + class AdminImageTag(ImageTag): """ This tag is special for Planète Casio, as it takes images from the `ad`ministration's image folder. It just adds this folder's prefix. Example uses: - + [adimg]some_picture.png[/img] [adimg=center]some_picture.png[/img] [adimg=12x24]some_picture.png[/img] diff --git a/textoutpc/builtin/_Label.py b/textoutpc/builtin/_Label.py index 587d125..3715917 100755 --- a/textoutpc/builtin/_Label.py +++ b/textoutpc/builtin/_Label.py @@ -11,10 +11,11 @@ __all__ = ["LabelTag", "TargetTag"] _labelexpr = _re.compile('^[a-z0-9-]{1,16}$', _re.I) + class LabelTag(_InlineTag): """ The label tag, defines an anchor at a point of the post. Example uses: - + [label=installation]Installation de tel logiciel... (no ending req.) [label=compilation][/label] Compilation de tel logiciel... """ @@ -33,10 +34,11 @@ class LabelTag(_InlineTag): name = self.tweak("label_prefix", "") + self._label return ''.format(name) + class TargetTag(_InlineTag): """ The goto tag, links to an anchor defined in the post. Example uses: - + [target=installation]Check out the installation manual[/target]! """ diff --git a/textoutpc/builtin/_Link.py b/textoutpc/builtin/_Link.py index 854c37c..efe4a5a 100755 --- a/textoutpc/builtin/_Link.py +++ b/textoutpc/builtin/_Link.py @@ -9,10 +9,11 @@ from html import escape as _htmlescape __all__ = ["LinkTag", "ProfileTag", "TopicTag", "TutorialTag", "ProgramTag"] + class LinkTag(_InlineTag): """ The main link tag. Example uses: - + [url=https://example.org/hi]Go to example.org[/url]! [url=/Fr/index.php][/url] [url]https://random.org/randomize.php[/url] """ @@ -33,7 +34,7 @@ class LinkTag(_InlineTag): # If there is no value, wait until we have a content to # decide if we are valid or not. - if value == None: + if value is None: self.preprocess = self._preprocess_if_no_value return @@ -63,11 +64,12 @@ class LinkTag(_InlineTag): url = self._url.replace('(', '%28').replace(')', '%29') return ']({})'.format(url) + class ProfileTag(LinkTag): """ A special link tag for Planète Casio's profiles. Adds the prefix to the content, and sets the value. Example uses: - + [profil]Cakeisalie5[/] """ aliases = ('[profil]', '[profile]') @@ -82,7 +84,7 @@ class ProfileTag(LinkTag): username = content allowed = "abcdefghijklmnopqrstuvwxyz0123456789_ -." - if any(not car in allowed for car in allowed): + if any(car not in allowed for car in allowed): raise ValueError("invalid username!") # Prepare the tag. @@ -91,11 +93,12 @@ class ProfileTag(LinkTag): '?membre={}'.format(username) self._validate() + class TopicTag(LinkTag): """ A special link tag for Planète Casio's topics. Adds the prefix to the content, and sets the value. Example uses: - + [topic]234[/] """ aliases = ('[topic]',) @@ -116,11 +119,12 @@ class TopicTag(LinkTag): f'lecture_sujet.php?id={topic}' self._validate() + class TutorialTag(LinkTag): """ A special link tag for Planète Casio's tutorial. Adds the prefix to the content, and sets the value. Example uses: - + [tutorial]71[/tutorial] [tuto]71[/tuto] """ @@ -142,11 +146,12 @@ class TutorialTag(LinkTag): f'tutoriels.php?id={topic}' self._validate() + class ProgramTag(LinkTag): """ A special link tag for a Planète Casio's program. Adds the prefix to the content, and sets the value. Example uses: - + [program]3598[/program] [prog]3598[/prog] """ diff --git a/textoutpc/builtin/_Progress.py b/textoutpc/builtin/_Progress.py index b244c24..3692dc3 100755 --- a/textoutpc/builtin/_Progress.py +++ b/textoutpc/builtin/_Progress.py @@ -8,10 +8,11 @@ from .. import BlockTag as _BlockTag __all__ = ["ProgressTag"] + class ProgressTag(_BlockTag): """ Progress tag, used to display the progress on anything. Usage: - + [progress=50]My great progress bar[/progress] [progress=100][/progress] """ @@ -28,8 +29,8 @@ class ProgressTag(_BlockTag): def end_html(self): return '' \ - '{}
{}
{}
{}