diff options
| author | Aymeric Augustin | 2013-10-16 23:08:03 +0200 |
|---|---|---|
| committer | Aymeric Augustin | 2013-10-17 18:24:58 +0200 |
| commit | edd871bd37833fff7c5964896299999ce6da8e1c (patch) | |
| tree | a8ecf277f5e07a45cdff4327d8405ab9f77e8966 /debug_toolbar/utils/__init__.py | |
| parent | 23c44d8c5cf560cc8cb304d8753e8b658d1fe70d (diff) | |
| download | django-debug-toolbar-edd871bd37833fff7c5964896299999ce6da8e1c.tar.bz2 | |
Switch from str & unicode to bytes & text.
Diffstat (limited to 'debug_toolbar/utils/__init__.py')
| -rw-r--r-- | debug_toolbar/utils/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/debug_toolbar/utils/__init__.py b/debug_toolbar/utils/__init__.py index fa8c78a..7efb106 100644 --- a/debug_toolbar/utils/__init__.py +++ b/debug_toolbar/utils/__init__.py @@ -10,6 +10,7 @@ from django.conf import settings from django.views.debug import linebreak_iter from django.utils.html import escape from django.utils.safestring import mark_safe +from django.utils import six # Figure out some paths django_path = os.path.realpath(os.path.dirname(django.__file__)) @@ -58,7 +59,7 @@ def render_stacktrace(trace): stacktrace = [] for frame in trace: params = map(escape, frame[0].rsplit(os.path.sep, 1) + list(frame[1:])) - params_dict = dict((unicode(idx), v) for idx, v in enumerate(params)) + params_dict = dict((six.text_type(idx), v) for idx, v in enumerate(params)) try: stacktrace.append('<span class="path">%(0)s/</span>' '<span class="file">%(1)s</span>' |
