aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAymeric Augustin2013-11-01 14:20:25 +0100
committerAymeric Augustin2013-11-01 14:20:25 +0100
commitd3c0ca8b14682b399248db19b1ac329f39b17b89 (patch)
treeb92ed6ae0a6c769ad773612c6fe9039f2b0346c1
parent0196c26cfb277dda31870fe36eca8b511a0e39dc (diff)
downloaddjango-debug-toolbar-d3c0ca8b14682b399248db19b1ac329f39b17b89.tar.bz2
Fix support for non-ASCII keys in sessions.
-rw-r--r--debug_toolbar/panels/request_vars.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/debug_toolbar/panels/request_vars.py b/debug_toolbar/panels/request_vars.py
index 875fc3d..32d5d05 100644
--- a/debug_toolbar/panels/request_vars.py
+++ b/debug_toolbar/panels/request_vars.py
@@ -2,6 +2,7 @@ from __future__ import unicode_literals
from django.core.urlresolvers import resolve
from django.http import Http404
+from django.utils.encoding import force_text
from django.utils.translation import ugettext_lazy as _
from debug_toolbar.panels import DebugPanel
@@ -55,5 +56,5 @@ class RequestVarsDebugPanel(DebugPanel):
if hasattr(self.request, 'session'):
self.record_stats({
'session': [(k, self.request.session.get(k))
- for k in sorted(self.request.session.keys())]
+ for k in sorted(self.request.session.keys(), key=force_text)]
})