diff options
Diffstat (limited to 'debug_toolbar/panels')
| -rw-r--r-- | debug_toolbar/panels/cache.py | 5 | ||||
| -rw-r--r-- | debug_toolbar/panels/signals.py | 8 | ||||
| -rw-r--r-- | debug_toolbar/panels/template.py | 3 |
3 files changed, 6 insertions, 10 deletions
diff --git a/debug_toolbar/panels/cache.py b/debug_toolbar/panels/cache.py index b3cb540..8127d55 100644 --- a/debug_toolbar/panels/cache.py +++ b/debug_toolbar/panels/cache.py @@ -16,6 +16,7 @@ from django.utils.translation import ugettext_lazy as _, ungettext from debug_toolbar.panels import DebugPanel from debug_toolbar.utils import (tidy_stacktrace, render_stacktrace, get_template_info, get_stack) +from debug_toolbar.utils.settings import CONFIG cache_called = Signal(providing_args=[ @@ -28,9 +29,7 @@ def send_signal(method): value = method(self, *args, **kwargs) t = time.time() - t - debug_toolbar_config = getattr(settings, 'DEBUG_TOOLBAR_CONFIG', {}) - enable_stacktraces = debug_toolbar_config.get('ENABLE_STACKTRACES', True) - if enable_stacktraces: + if CONFIG['ENABLE_STACKTRACES']: stacktrace = tidy_stacktrace(reversed(get_stack())) else: stacktrace = [] diff --git a/debug_toolbar/panels/signals.py b/debug_toolbar/panels/signals.py index f7d4239..ae6b773 100644 --- a/debug_toolbar/panels/signals.py +++ b/debug_toolbar/panels/signals.py @@ -1,6 +1,5 @@ from __future__ import unicode_literals -from django.conf import settings from django.core.signals import ( request_started, request_finished, got_request_exception) from django.db.models.signals import ( @@ -17,6 +16,7 @@ except ImportError: connection_created = None from debug_toolbar.panels import DebugPanel +from debug_toolbar.utils.settings import CONFIG class SignalDebugPanel(DebugPanel): @@ -66,11 +66,7 @@ class SignalDebugPanel(DebugPanel): @property def signals(self): signals = self.SIGNALS.copy() - if hasattr(settings, 'DEBUG_TOOLBAR_CONFIG'): - extra_signals = settings.DEBUG_TOOLBAR_CONFIG.get('EXTRA_SIGNALS', []) - else: - extra_signals = [] - for signal in extra_signals: + for signal in CONFIG['EXTRA_SIGNALS']: mod_path, signal_name = signal.rsplit('.', 1) signals_mod = import_module(mod_path) signals[signal_name] = getattr(signals_mod, signal_name) diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py index d8f96f2..f8cd46b 100644 --- a/debug_toolbar/panels/template.py +++ b/debug_toolbar/panels/template.py @@ -12,6 +12,7 @@ from django.utils.translation import ugettext_lazy as _ from django.db.models.query import QuerySet, RawQuerySet from debug_toolbar.panels import DebugPanel from debug_toolbar.utils.tracking.db import recording, SQLQueryTriggered +from debug_toolbar.utils.settings import CONFIG # Code taken and adapted from Simon Willison and Django Snippets: # http://www.djangosnippets.org/snippets/766/ @@ -133,7 +134,7 @@ class TemplateDebugPanel(DebugPanel): template.origin_name = 'No origin' info['template'] = template # Clean up context for better readability - if getattr(settings, 'DEBUG_TOOLBAR_CONFIG', {}).get('SHOW_TEMPLATE_CONTEXT', True): + if CONFIG['SHOW_TEMPLATE_CONTEXT']: context_list = template_data.get('context', []) info['context'] = '\n'.join(context_list) template_context.append(info) |