diff --git a/debug_toolbar/panels/templates/views.py b/debug_toolbar/panels/templates/views.py index 8d6d634d3..134b3d476 100644 --- a/debug_toolbar/panels/templates/views.py +++ b/debug_toolbar/panels/templates/views.py @@ -3,7 +3,7 @@ from django.template import Origin, TemplateDoesNotExist from django.template.engine import Engine from django.template.loader import render_to_string -from django.utils.safestring import mark_safe +from django.utils.html import format_html, mark_safe from debug_toolbar.decorators import require_show_toolbar @@ -50,12 +50,11 @@ def template_source(request): from pygments import highlight from pygments.formatters import HtmlFormatter from pygments.lexers import HtmlDjangoLexer - + except ModuleNotFoundError: + source = format_html("{}", source) + else: source = highlight(source, HtmlDjangoLexer(), HtmlFormatter()) source = mark_safe(source) - source.pygmentized = True - except ImportError: - pass content = render_to_string( "debug_toolbar/panels/template_source.html", diff --git a/debug_toolbar/templates/debug_toolbar/panels/template_source.html b/debug_toolbar/templates/debug_toolbar/panels/template_source.html index 229ea83e4..397c44b24 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/template_source.html +++ b/debug_toolbar/templates/debug_toolbar/panels/template_source.html @@ -5,10 +5,6 @@

{% trans "Template source:" %} {{ template_name }}

- {% if not source.pygmentized %} - {{ source }} - {% else %} - {{ source }} - {% endif %} + {{ source }}
diff --git a/tox.ini b/tox.ini index ae3936228..ad2e6c090 100644 --- a/tox.ini +++ b/tox.ini @@ -17,6 +17,7 @@ deps = coverage Jinja2 html5lib + pygments selenium sqlparse passenv=