diff options
28 files changed, 63 insertions, 13 deletions
diff --git a/debug_toolbar/__init__.py b/debug_toolbar/__init__.py index feb6925..3a8f300 100644 --- a/debug_toolbar/__init__.py +++ b/debug_toolbar/__init__.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + __all__ = ('VERSION',) try: diff --git a/debug_toolbar/forms.py b/debug_toolbar/forms.py index c661c9e..aad308a 100644 --- a/debug_toolbar/forms.py +++ b/debug_toolbar/forms.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import json import hashlib diff --git a/debug_toolbar/management/commands/debugsqlshell.py b/debug_toolbar/management/commands/debugsqlshell.py index 45a23c2..e94e4e2 100644 --- a/debug_toolbar/management/commands/debugsqlshell.py +++ b/debug_toolbar/management/commands/debugsqlshell.py @@ -1,4 +1,4 @@ -from __future__ import print_function +from __future__ import print_function, unicode_literals from datetime import datetime diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py index 090e206..82f83da 100644 --- a/debug_toolbar/middleware.py +++ b/debug_toolbar/middleware.py @@ -1,6 +1,9 @@ """ Debug Toolbar middleware """ + +from __future__ import unicode_literals + import imp import threading @@ -48,7 +51,7 @@ class DebugToolbarMiddleware(object): self.show_toolbar = self._show_toolbar # default # The tag to attach the toolbar to - self.tag = u'</body>' + self.tag = '</body>' if hasattr(settings, 'DEBUG_TOOLBAR_CONFIG'): show_toolbar_callback = settings.DEBUG_TOOLBAR_CONFIG.get( @@ -58,7 +61,7 @@ class DebugToolbarMiddleware(object): tag = settings.DEBUG_TOOLBAR_CONFIG.get('TAG', None) if tag: - self.tag = u'</' + tag + u'>' + self.tag = '</' + tag + '>' def _show_toolbar(self, request): if getattr(settings, 'TEST', False): diff --git a/debug_toolbar/models.py b/debug_toolbar/models.py index 7ef8601..510ce88 100644 --- a/debug_toolbar/models.py +++ b/debug_toolbar/models.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + from django.conf import settings from django.utils.importlib import import_module diff --git a/debug_toolbar/panels/__init__.py b/debug_toolbar/panels/__init__.py index f1751d8..9998196 100644 --- a/debug_toolbar/panels/__init__.py +++ b/debug_toolbar/panels/__init__.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + from django.template.defaultfilters import slugify from django.template.loader import render_to_string from debug_toolbar.middleware import DebugToolbarMiddleware diff --git a/debug_toolbar/panels/cache.py b/debug_toolbar/panels/cache.py index 852327d..80a3b46 100644 --- a/debug_toolbar/panels/cache.py +++ b/debug_toolbar/panels/cache.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import inspect import sys import time @@ -59,7 +61,7 @@ class CacheStatTracker(BaseCache): self.cache = cache def __repr__(self): - return u"<CacheStatTracker for %s>" % self.cache.__repr__() + return str("<CacheStatTracker for %s>") % repr(self.cache) def _get_func_info(self): frame = sys._getframe(3) diff --git a/debug_toolbar/panels/headers.py b/debug_toolbar/panels/headers.py index 9824d0e..4a10b5f 100644 --- a/debug_toolbar/panels/headers.py +++ b/debug_toolbar/panels/headers.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + from django.utils.translation import ugettext_lazy as _ from debug_toolbar.panels import DebugPanel diff --git a/debug_toolbar/panels/logger.py b/debug_toolbar/panels/logger.py index 816e718..c6c1bd1 100644 --- a/debug_toolbar/panels/logger.py +++ b/debug_toolbar/panels/logger.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import datetime import logging try: diff --git a/debug_toolbar/panels/profiling.py b/debug_toolbar/panels/profiling.py index f21c345..c93c3b3 100644 --- a/debug_toolbar/panels/profiling.py +++ b/debug_toolbar/panels/profiling.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, unicode_literals from django.utils.translation import ugettext_lazy as _ from django.utils.safestring import mark_safe diff --git a/debug_toolbar/panels/request_vars.py b/debug_toolbar/panels/request_vars.py index ade23f3..936c964 100644 --- a/debug_toolbar/panels/request_vars.py +++ b/debug_toolbar/panels/request_vars.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + from django.core.urlresolvers import resolve from django.http import Http404 from django.utils.translation import ugettext_lazy as _ diff --git a/debug_toolbar/panels/settings_vars.py b/debug_toolbar/panels/settings_vars.py index 54791c2..b5721ee 100644 --- a/debug_toolbar/panels/settings_vars.py +++ b/debug_toolbar/panels/settings_vars.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + from django.conf import settings from django.views.debug import get_safe_settings from django.utils.translation import ugettext_lazy as _ diff --git a/debug_toolbar/panels/signals.py b/debug_toolbar/panels/signals.py index 984b064..d6a5b2e 100644 --- a/debug_toolbar/panels/signals.py +++ b/debug_toolbar/panels/signals.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + from django.conf import settings from django.core.signals import (request_started, request_finished, got_request_exception) diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py index 4a0fc82..7afc6eb 100644 --- a/debug_toolbar/panels/sql.py +++ b/debug_toolbar/panels/sql.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import uuid from copy import copy diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py index 7b01291..8ecf5d6 100644 --- a/debug_toolbar/panels/template.py +++ b/debug_toolbar/panels/template.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + from os.path import normpath from pprint import pformat diff --git a/debug_toolbar/panels/timer.py b/debug_toolbar/panels/timer.py index fa23617..9b420cb 100644 --- a/debug_toolbar/panels/timer.py +++ b/debug_toolbar/panels/timer.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + try: import resource except ImportError: diff --git a/debug_toolbar/panels/version.py b/debug_toolbar/panels/version.py index ccb0ad8..b19d306 100644 --- a/debug_toolbar/panels/version.py +++ b/debug_toolbar/panels/version.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import sys import django diff --git a/debug_toolbar/templatetags/debug_toolbar_utils.py b/debug_toolbar/templatetags/debug_toolbar_utils.py index c057312..7917a67 100644 --- a/debug_toolbar/templatetags/debug_toolbar_utils.py +++ b/debug_toolbar/templatetags/debug_toolbar_utils.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from django import template from django.utils.numberformat import format diff --git a/debug_toolbar/toolbar/loader.py b/debug_toolbar/toolbar/loader.py index 5f01aa7..73ab0b6 100644 --- a/debug_toolbar/toolbar/loader.py +++ b/debug_toolbar/toolbar/loader.py @@ -2,6 +2,8 @@ The main DebugToolbar class that loads and renders the Toolbar. """ +from __future__ import unicode_literals + from django.conf import settings from django.template.loader import render_to_string from django.utils.datastructures import SortedDict @@ -16,7 +18,7 @@ class DebugToolbar(object): base_url = self.request.META.get('SCRIPT_NAME', '') self.config = { 'INTERCEPT_REDIRECTS': True, - 'MEDIA_URL': u'%s/__debug__/m/' % base_url + 'MEDIA_URL': '%s/__debug__/m/' % base_url } # Check if settings has a DEBUG_TOOLBAR_CONFIG and updated config self.config.update(getattr(settings, 'DEBUG_TOOLBAR_CONFIG', {})) diff --git a/debug_toolbar/urls.py b/debug_toolbar/urls.py index 4280a18..524710d 100644 --- a/debug_toolbar/urls.py +++ b/debug_toolbar/urls.py @@ -5,6 +5,8 @@ These should not be loaded explicitly; the debug toolbar middleware will patch this into the urlconf for the request. """ +from __future__ import unicode_literals + from django.conf.urls import patterns, url _PREFIX = '__debug__' diff --git a/debug_toolbar/utils/__init__.py b/debug_toolbar/utils/__init__.py index b8bb4a1..fa8c78a 100644 --- a/debug_toolbar/utils/__init__.py +++ b/debug_toolbar/utils/__init__.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import inspect import os.path import django @@ -58,11 +60,11 @@ def render_stacktrace(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)) try: - stacktrace.append(u'<span class="path">%(0)s/</span>' - u'<span class="file">%(1)s</span>' - u' in <span class="func">%(3)s</span>' - u'(<span class="lineno">%(2)s</span>)\n' - u' <span class="code">%(4)s</span>' + stacktrace.append('<span class="path">%(0)s/</span>' + '<span class="file">%(1)s</span>' + ' in <span class="func">%(3)s</span>' + '(<span class="lineno">%(2)s</span>)\n' + ' <span class="code">%(4)s</span>' % params_dict) except KeyError: # This frame doesn't have the expected format, so skip it and move on to the next one diff --git a/debug_toolbar/utils/sql.py b/debug_toolbar/utils/sql.py index 5de7da5..4e0d70d 100644 --- a/debug_toolbar/utils/sql.py +++ b/debug_toolbar/utils/sql.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import re from django.utils.html import escape diff --git a/debug_toolbar/utils/tracking/__init__.py b/debug_toolbar/utils/tracking/__init__.py index 9a59273..ac00f4c 100644 --- a/debug_toolbar/utils/tracking/__init__.py +++ b/debug_toolbar/utils/tracking/__init__.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import logging import time import types diff --git a/debug_toolbar/utils/tracking/db.py b/debug_toolbar/utils/tracking/db.py index a9c36dc..59c9199 100644 --- a/debug_toolbar/utils/tracking/db.py +++ b/debug_toolbar/utils/tracking/db.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import sys from datetime import datetime diff --git a/debug_toolbar/views.py b/debug_toolbar/views.py index 045e5cc..f625224 100644 --- a/debug_toolbar/views.py +++ b/debug_toolbar/views.py @@ -4,6 +4,8 @@ debug toolbar is displayed, and typically can do Bad Things, so hooking up these views in any other way is generally not advised. """ +from __future__ import unicode_literals + from django.http import HttpResponseBadRequest from django.shortcuts import render_to_response from django.views.decorators.csrf import csrf_exempt diff --git a/tests/tests.py b/tests/tests.py index 4c6f246..5dcb034 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -1,4 +1,4 @@ -from __future__ import with_statement +from __future__ import unicode_literals import thread import django diff --git a/tests/urls.py b/tests/urls.py index 326c61a..9c24c1e 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -5,6 +5,8 @@ These should not be loaded explicitly; the debug toolbar middleware will patch this into the urlconf for the request. """ +from __future__ import unicode_literals + from django.conf.urls import patterns, url from django.contrib import admin diff --git a/tests/views.py b/tests/views.py index 909a784..ec9f30e 100644 --- a/tests/views.py +++ b/tests/views.py @@ -1,9 +1,11 @@ +from __future__ import unicode_literals + from django.contrib.auth.models import User from django.http import HttpResponse def execute_sql(request): list(User.objects.all()) - + return HttpResponse() def resolving_view(request, arg1, arg2): |