Move the logic to load panels inside the DebugToolbar class.

This has the additional advantage of eliminating a side-effect that
happened at import time unnecessarily.

It justified refactoring the way we handle settings and defaults.

3 files changed, 6 insertions, 6 deletions

diff --git a/debug_toolbar/panels/cache.py b/debug_toolbar/panels/cache.py
index 831eacb..7d42c1f 100644
--- a/debug_toolbar/panels/cache.py
+++ b/debug_toolbar/panels/cache.py
@@ -16,7 +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
+from debug_toolbar.utils import settings as dt_settings
 
 
 cache_called = Signal(providing_args=[
@@ -29,7 +29,7 @@ def send_signal(method):
         value = method(self, *args, **kwargs)
         t = time.time() - t
 
-        if CONFIG['ENABLE_STACKTRACES']:
+        if dt_settings.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 3dd035a..1d24b80 100644
--- a/debug_toolbar/panels/signals.py
+++ b/debug_toolbar/panels/signals.py
@@ -16,7 +16,7 @@ except ImportError:
     connection_created = None
 
 from debug_toolbar.panels import DebugPanel
-from debug_toolbar.utils.settings import CONFIG
+from debug_toolbar.utils import settings as dt_settings
 
 
 class SignalDebugPanel(DebugPanel):
@@ -63,7 +63,7 @@ class SignalDebugPanel(DebugPanel):
     @property
     def signals(self):
         signals = self.SIGNALS.copy()
-        for signal in CONFIG['EXTRA_SIGNALS']:
+        for signal in dt_settings.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 172765a..d918cd7 100644
--- a/debug_toolbar/panels/template.py
+++ b/debug_toolbar/panels/template.py
@@ -15,7 +15,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from debug_toolbar.panels import DebugPanel
 from debug_toolbar.utils.tracking.db import recording, SQLQueryTriggered
-from debug_toolbar.utils.settings import CONFIG
+from debug_toolbar.utils import settings as dt_settings
 
 # Code taken and adapted from Simon Willison and Django Snippets:
 # http://www.djangosnippets.org/snippets/766/
@@ -140,7 +140,7 @@ class TemplateDebugPanel(DebugPanel):
                 template.origin_name = 'No origin'
             info['template'] = template
             # Clean up context for better readability
-            if CONFIG['SHOW_TEMPLATE_CONTEXT']:
+            if dt_settings.CONFIG['SHOW_TEMPLATE_CONTEXT']:
                 context_list = template_data.get('context', [])
                 info['context'] = '\n'.join(context_list)
             template_context.append(info)