From b7fad0aac0d94ac7e767ac952ebf1c205352b240 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Sun, 7 Sep 2008 16:07:23 -0700
Subject: Fixing a bug reported that was causing encoding errors. Thanks Chris
Kelly for the patch
---
debug_toolbar/middleware.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'debug_toolbar')
diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index 870dbb8..8883b37 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -3,7 +3,7 @@ Debug Toolbar middleware
"""
import re
from django.conf import settings
-from django.utils.safestring import mark_safe
+from django.utils.encoding import smart_str
from debug_toolbar.toolbar.loader import DebugToolbar
_HTML_TYPES = ('text/html', 'application/xhtml+xml')
@@ -34,6 +34,7 @@ class DebugToolbarMiddleware(object):
def process_response(self, request, response):
if self.show_toolbar(request):
if response['Content-Type'].split(';')[0] in _HTML_TYPES and not request.is_ajax():
- #response.content = _END_HEAD_RE.sub(mark_safe(self.debug_toolbar.render_styles() + "%s" % match.group()), response.content)
- response.content = _END_BODY_RE.sub(mark_safe(self.debug_toolbar.render_toolbar() + ' '), response.content)
+ # Saving this here in case we ever need to inject into