aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAymeric Augustin2013-11-14 22:35:59 +0100
committerAymeric Augustin2013-11-14 22:35:59 +0100
commit80e94bd64ca23d78e57fe0937a9924e4df08072a (patch)
tree4a32dea6379a9b1338db03b36bbbce5bb1699a38
parentd4c340c857a09341595598a54c6bc7112a60be47 (diff)
downloaddjango-debug-toolbar-80e94bd64ca23d78e57fe0937a9924e4df08072a.tar.bz2
Fix #445 -- UnicodeDecodeError in SQLSelectForm.
-rw-r--r--debug_toolbar/forms.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/debug_toolbar/forms.py b/debug_toolbar/forms.py
index 01a4807..4f60c11 100644
--- a/debug_toolbar/forms.py
+++ b/debug_toolbar/forms.py
@@ -77,7 +77,8 @@ class SQLSelectForm(forms.Form):
return reformat_sql(self.cleaned_data['sql'])
def make_hash(self, data):
- params = force_text(settings.SECRET_KEY) + data['sql'] + data['params']
+ params = (force_text(settings.SECRET_KEY) +
+ force_text(data['sql']) + force_text(data['params']))
return hashlib.sha1(params.encode('utf-8')).hexdigest()
@property