aboutsummaryrefslogtreecommitdiffstats
path: root/debug_toolbar/panels/signals.py
diff options
context:
space:
mode:
authorAymeric Augustin2013-10-27 12:48:44 +0100
committerAymeric Augustin2013-10-27 12:48:44 +0100
commit9cb9796791062c9d208c0f887dc65142d42c022a (patch)
tree40ba69bec7f39115ccfcc88c5b1cfa2baf2f86ea /debug_toolbar/panels/signals.py
parentc710140a15222af2cf31b7579c6a5fedf9a482d5 (diff)
downloaddjango-debug-toolbar-9cb9796791062c9d208c0f887dc65142d42c022a.tar.bz2
Centralize access to config and default values.
Diffstat (limited to 'debug_toolbar/panels/signals.py')
-rw-r--r--debug_toolbar/panels/signals.py8
1 files changed, 2 insertions, 6 deletions
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)