diff options
Diffstat (limited to 'debug_toolbar')
| -rw-r--r-- | debug_toolbar/panels/cache.py | 7 | ||||
| -rw-r--r-- | debug_toolbar/panels/settings.py | 8 | ||||
| -rw-r--r-- | debug_toolbar/panels/staticfiles.py | 7 | ||||
| -rw-r--r-- | debug_toolbar/panels/versions.py | 9 | ||||
| -rw-r--r-- | debug_toolbar/toolbar.py | 9 |
5 files changed, 28 insertions, 12 deletions
diff --git a/debug_toolbar/panels/cache.py b/debug_toolbar/panels/cache.py index 1c37c6b..bdc8a4d 100644 --- a/debug_toolbar/panels/cache.py +++ b/debug_toolbar/panels/cache.py @@ -10,8 +10,11 @@ from django.core.cache import cache as original_cache, get_cache as original_get from django.core.cache.backends.base import BaseCache from django.dispatch import Signal from django.template import Node -from django.utils.datastructures import SortedDict from django.utils.translation import ugettext_lazy as _, ungettext +try: + from collections import OrderedDict +except ImportError: + from django.utils.datastructures import SortedDict as OrderedDict from debug_toolbar.panels import Panel from debug_toolbar.utils import (tidy_stacktrace, render_stacktrace, @@ -139,7 +142,7 @@ class CachePanel(Panel): self.hits = 0 self.misses = 0 self.calls = [] - self.counts = SortedDict(( + self.counts = OrderedDict(( ('add', 0), ('get', 0), ('set', 0), diff --git a/debug_toolbar/panels/settings.py b/debug_toolbar/panels/settings.py index c59d1d1..b054f8b 100644 --- a/debug_toolbar/panels/settings.py +++ b/debug_toolbar/panels/settings.py @@ -3,7 +3,10 @@ from __future__ import absolute_import, unicode_literals from django.conf import settings from django.views.debug import get_safe_settings from django.utils.translation import ugettext_lazy as _ -from django.utils.datastructures import SortedDict +try: + from collections import OrderedDict +except ImportError: + from django.utils.datastructures import SortedDict as OrderedDict from debug_toolbar.panels import Panel @@ -21,5 +24,6 @@ class SettingsPanel(Panel): def process_response(self, request, response): self.record_stats({ - 'settings': SortedDict(sorted(get_safe_settings().items(), key=lambda s: s[0])), + 'settings': OrderedDict(sorted(get_safe_settings().items(), + key=lambda s: s[0])), }) diff --git a/debug_toolbar/panels/staticfiles.py b/debug_toolbar/panels/staticfiles.py index 4ccac71..94bc35a 100644 --- a/debug_toolbar/panels/staticfiles.py +++ b/debug_toolbar/panels/staticfiles.py @@ -12,8 +12,11 @@ from django.contrib.staticfiles import finders, storage from django.contrib.staticfiles.templatetags import staticfiles from django.utils.translation import ungettext, ugettext_lazy as _ -from django.utils.datastructures import SortedDict from django.utils.functional import LazyObject +try: + from collections import OrderedDict +except ImportError: + from django.utils.datastructures import SortedDict as OrderedDict from debug_toolbar import panels from debug_toolbar.utils import ThreadCollector @@ -132,7 +135,7 @@ class StaticFilesPanel(panels.Panel): of relative and file system paths which that finder was able to find. """ - finders_mapping = SortedDict() + finders_mapping = OrderedDict() for finder in finders.get_finders(): for path, finder_storage in finder.list([]): if getattr(finder_storage, 'prefix', None): diff --git a/debug_toolbar/panels/versions.py b/debug_toolbar/panels/versions.py index 85672b8..321ba6e 100644 --- a/debug_toolbar/panels/versions.py +++ b/debug_toolbar/panels/versions.py @@ -4,9 +4,12 @@ import sys import django from django.conf import settings -from django.utils.translation import ugettext_lazy as _ -from django.utils.datastructures import SortedDict from django.utils.importlib import import_module +from django.utils.translation import ugettext_lazy as _ +try: + from collections import OrderedDict +except ImportError: + from django.utils.datastructures import SortedDict as OrderedDict from debug_toolbar.panels import Panel @@ -46,6 +49,6 @@ class VersionsPanel(Panel): versions = sorted(versions, key=lambda version: version[0]) self.record_stats({ - 'versions': SortedDict(versions), + 'versions': OrderedDict(versions), 'paths': sys.path, }) diff --git a/debug_toolbar/toolbar.py b/debug_toolbar/toolbar.py index 36c301a..82851b3 100644 --- a/debug_toolbar/toolbar.py +++ b/debug_toolbar/toolbar.py @@ -9,8 +9,11 @@ import uuid from django.conf.urls import patterns, url from django.core.exceptions import ImproperlyConfigured from django.template.loader import render_to_string -from django.utils.datastructures import SortedDict from django.utils.importlib import import_module +try: + from collections import OrderedDict +except ImportError: + from django.utils.datastructures import SortedDict as OrderedDict from debug_toolbar import settings as dt_settings @@ -20,7 +23,7 @@ class DebugToolbar(object): def __init__(self, request): self.request = request self.config = dt_settings.CONFIG.copy() - self._panels = SortedDict() + self._panels = OrderedDict() for panel_class in self.get_panel_classes(): panel_instance = panel_class(self) self._panels[panel_instance.panel_id] = panel_instance @@ -61,7 +64,7 @@ class DebugToolbar(object): # Handle storing toolbars in memory and fetching them later on - _store = SortedDict() + _store = OrderedDict() def should_render_panels(self): render_panels = self.config['RENDER_PANELS'] |