From 83bf2ab79b6f1c3004188969954b37b725f0ac4c Mon Sep 17 00:00:00 2001 From: Chase Finch Date: Wed, 22 Dec 2021 13:27:40 -0500 Subject: [PATCH] Remove unneeded force_text --- .../templatetags/markdown_deux_tags.py | 24 ++++--------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/lib/markdown_deux/templatetags/markdown_deux_tags.py b/lib/markdown_deux/templatetags/markdown_deux_tags.py index 297691b..aab77e6 100644 --- a/lib/markdown_deux/templatetags/markdown_deux_tags.py +++ b/lib/markdown_deux/templatetags/markdown_deux_tags.py @@ -1,15 +1,12 @@ from django import template from django.utils.safestring import mark_safe -from django.utils.encoding import force_text import markdown_deux from markdown_deux.conf import settings - register = template.Library() - @register.filter(name="markdown") def markdown_filter(value, style="default"): """Processes the given value as Markdown, optionally using a particular @@ -22,15 +19,9 @@ def markdown_filter(value, style="default"): Markdown "styles" are defined by the `MARKDOWN_DEUX_STYLES` setting. """ - try: - return mark_safe(markdown_deux.markdown(value, style)) - except ImportError: - if settings.DEBUG: - raise template.TemplateSyntaxError("Error in `markdown` filter: " - "The python-markdown2 library isn't installed.") - return force_text(value) -markdown_filter.is_safe = True + return mark_safe(markdown_deux.markdown(value, style)) +markdown_filter.is_safe = True @register.tag(name="markdown") def markdown_tag(parser, token): @@ -46,19 +37,14 @@ def markdown_tag(parser, token): parser.delete_first_token() # consume '{% endmarkdown %}' return MarkdownNode(style, nodelist) + class MarkdownNode(template.Node): def __init__(self, style, nodelist): self.style = style self.nodelist = nodelist def render(self, context): value = self.nodelist.render(context) - try: - return mark_safe(markdown_deux.markdown(value, self.style)) - except ImportError: - if settings.DEBUG: - raise template.TemplateSyntaxError("Error in `markdown` tag: " - "The python-markdown2 library isn't installed.") - return force_text(value) + return mark_safe(markdown_deux.markdown(value, self.style)) @register.inclusion_tag("markdown_deux/markdown_cheatsheet.html") @@ -71,5 +57,3 @@ def markdown_allowed(): return ('Markdown syntax allowed, but no raw HTML. ' 'Examples: **bold**, *italic*, indent 4 spaces for a code block.' % settings.MARKDOWN_DEUX_HELP_URL) - -