From 0e262aefe7b272ac8d8725f2af2f304a26f20927 Mon Sep 17 00:00:00 2001
From: Apkawa
Date: Wed, 26 Oct 2011 23:01:50 +0400
Subject: Fixed ProfilingDebugPanel; fixed example site if installed other
 debug_toolbar in system

---
 debug_toolbar/utils/tracking/db.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'debug_toolbar/utils/tracking/db.py')

diff --git a/debug_toolbar/utils/tracking/db.py b/debug_toolbar/utils/tracking/db.py
index a40976e..7370374 100644
--- a/debug_toolbar/utils/tracking/db.py
+++ b/debug_toolbar/utils/tracking/db.py
@@ -1,4 +1,3 @@
-import inspect
 import sys
 
 from datetime import datetime
@@ -7,7 +6,7 @@ from threading import local
 from django.conf import settings
 from django.template import Node
 from django.utils import simplejson
-from django.utils.encoding import force_unicode
+from django.utils.encoding import force_unicode, smart_str
 from django.utils.hashcompat import sha_constructor
 
 from debug_toolbar.utils import ms_from_timedelta, tidy_stacktrace, get_template_info, \
@@ -113,7 +112,7 @@ class NormalCursorWrapper(object):
                 'duration': duration,
                 'raw_sql': sql,
                 'params': _params,
-                'hash': sha_constructor(settings.SECRET_KEY + sql + _params).hexdigest(),
+                'hash': sha_constructor(settings.SECRET_KEY + smart_str(sql) + _params).hexdigest(),
                 'stacktrace': stacktrace,
                 'start_time': start,
                 'stop_time': stop,
-- 
cgit v1.2.3