aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAymeric Augustin2014-04-03 19:51:30 +0200
committerAymeric Augustin2014-04-03 19:51:30 +0200
commit568568c7225d506c6ab995410c1b1e45d95b5b52 (patch)
treeac8bd0b681b27b3ed8a5730b11439183c8ccf9a0
parentc6a67bbed0c9853a9f9d67c6f55f4a06f9af45b7 (diff)
parent9eec3b68ebca42656ca15d50bbb1dd6b22ab95a7 (diff)
downloaddjango-debug-toolbar-568568c7225d506c6ab995410c1b1e45d95b5b52.tar.bz2
Merge pull request #551 from GomZik/master
Fix UnicodeDecodeError in SQL panel.
-rw-r--r--debug_toolbar/panels/sql/forms.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/debug_toolbar/panels/sql/forms.py b/debug_toolbar/panels/sql/forms.py
index 582f611..58a4dba 100644
--- a/debug_toolbar/panels/sql/forms.py
+++ b/debug_toolbar/panels/sql/forms.py
@@ -80,7 +80,7 @@ class SQLSelectForm(forms.Form):
items = [settings.SECRET_KEY, data['sql'], data['params']]
# Replace lines endings with spaces to preserve the hash value
# even when the browser normalizes \r\n to \n in inputs.
- items = [force_text(' '.join(item.splitlines())) for item in items]
+ items = [' '.join(force_text(item).splitlines()) for item in items]
return hashlib.sha1(''.join(items).encode('utf-8')).hexdigest()
@property