diff --git a/debug_toolbar/compat.py b/debug_toolbar/compat.py index 11b4268ee..f220b0589 100644 --- a/debug_toolbar/compat.py +++ b/debug_toolbar/compat.py @@ -9,4 +9,3 @@ from django.template.base import linebreak_iter # NOQA except ImportError: # Django < 1.9 from django.views.debug import linebreak_iter # NOQA - diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py index b94ce6f44..b1efb481d 100644 --- a/debug_toolbar/middleware.py +++ b/debug_toolbar/middleware.py @@ -114,15 +114,8 @@ def process_response(self, request, response): # Insert the toolbar in the response. content = force_text(response.content, encoding=settings.DEFAULT_CHARSET) insert_before = dt_settings.get_config()['INSERT_BEFORE'] - try: # Python >= 2.7 - pattern = re.escape(insert_before) - bits = re.split(pattern, content, flags=re.IGNORECASE) - except TypeError: # Python < 2.7 - pattern = '(.+?)(%s|$)' % re.escape(insert_before) - matches = re.findall(pattern, content, flags=re.DOTALL | re.IGNORECASE) - bits = [m[0] for m in matches if m[1] == insert_before] - # When the body ends with a newline, there's two trailing groups. - bits.append(''.join(m[0] for m in matches if m[1] == '')) + pattern = re.escape(insert_before) + bits = re.split(pattern, content, flags=re.IGNORECASE) if len(bits) > 1: # When the toolbar will be inserted for sure, generate the stats. for panel in reversed(toolbar.enabled_panels): diff --git a/debug_toolbar/panels/templates/panel.py b/debug_toolbar/panels/templates/panel.py index d8e05a991..7d8a079e4 100644 --- a/debug_toolbar/panels/templates/panel.py +++ b/debug_toolbar/panels/templates/panel.py @@ -5,11 +5,10 @@ from os.path import normpath from pprint import pformat -import django from django import http from django.conf.urls import url from django.db.models.query import QuerySet, RawQuerySet -from django.template import Context, RequestContext, Template +from django.template import RequestContext, Template from django.test.signals import template_rendered from django.test.utils import instrumented_test_render from django.utils import six diff --git a/debug_toolbar/panels/templates/views.py b/debug_toolbar/panels/templates/views.py index dbd52e5b0..db505d843 100644 --- a/debug_toolbar/panels/templates/views.py +++ b/debug_toolbar/panels/templates/views.py @@ -3,9 +3,8 @@ from django.http import HttpResponseBadRequest from django.shortcuts import render_to_response from django.template import TemplateDoesNotExist -from django.utils.safestring import mark_safe - from django.template.engine import Engine +from django.utils.safestring import mark_safe def template_source(request):