From 715fe284da176618f5cd404665641d67dc6fc875 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin
Date: Sat, 16 Nov 2013 21:13:21 +0100
Subject: Flat is better than nested.

---
 debug_toolbar/middleware.py          |  2 +-
 debug_toolbar/panels/cache.py        |  2 +-
 debug_toolbar/panels/sql/tracking.py |  2 +-
 debug_toolbar/settings.py            | 55 ++++++++++++++++++++++++++++++++++++
 debug_toolbar/toolbar.py             |  2 +-
 debug_toolbar/utils/settings.py      | 55 ------------------------------------
 6 files changed, 59 insertions(+), 59 deletions(-)
 create mode 100644 debug_toolbar/settings.py
 delete mode 100644 debug_toolbar/utils/settings.py

(limited to 'debug_toolbar')

diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index 1e698af..72f190e 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -10,7 +10,7 @@ from django.conf import settings
 from django.utils.encoding import force_text
 
 from debug_toolbar.toolbar import DebugToolbar
-from debug_toolbar.utils import settings as dt_settings
+from debug_toolbar import settings as dt_settings
 
 _HTML_TYPES = ('text/html', 'application/xhtml+xml')
 # Handles python threading module bug - http://bugs.python.org/issue14308
diff --git a/debug_toolbar/panels/cache.py b/debug_toolbar/panels/cache.py
index 7d42c1f..42e512f 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 import settings as dt_settings
+from debug_toolbar import settings as dt_settings
 
 
 cache_called = Signal(providing_args=[
diff --git a/debug_toolbar/panels/sql/tracking.py b/debug_toolbar/panels/sql/tracking.py
index fd56ff9..283e410 100644
--- a/debug_toolbar/panels/sql/tracking.py
+++ b/debug_toolbar/panels/sql/tracking.py
@@ -11,7 +11,7 @@ from django.utils.encoding import force_text
 from django.utils import six
 
 from debug_toolbar.utils import tidy_stacktrace, get_template_info, get_stack
-from debug_toolbar.utils import settings as dt_settings
+from debug_toolbar import settings as dt_settings
 
 
 class SQLQueryTriggered(Exception):
diff --git a/debug_toolbar/settings.py b/debug_toolbar/settings.py
new file mode 100644
index 0000000..f284c76
--- /dev/null
+++ b/debug_toolbar/settings.py
@@ -0,0 +1,55 @@
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.utils import six
+
+
+# Always import this module as follows:
+# from debug_toolbar import settings [as dt_settings]
+
+# Don't import directly CONFIG or PANELs, or you will miss changes performed
+# with override_settings in tests.
+
+
+CONFIG_DEFAULTS = {
+    'INTERCEPT_REDIRECTS': False,
+    'SHOW_TOOLBAR_CALLBACK': None,
+    'EXTRA_SIGNALS': [],
+    'HIDE_DJANGO_SQL': True,
+    'SHOW_TEMPLATE_CONTEXT': True,
+    'TAG': 'body',
+    'ENABLE_STACKTRACES': True,
+    'HIDDEN_STACKTRACE_MODULES': (
+        'socketserver' if six.PY3 else 'SocketServer',
+        'threading',
+        'wsgiref',
+        'debug_toolbar',
+    ),
+    'ROOT_TAG_ATTRS': '',
+    'SQL_WARNING_THRESHOLD': 500,   # milliseconds
+    'RESULTS_CACHE_SIZE': 10,
+    'RENDER_PANELS': None,
+}
+
+
+CONFIG = {}
+CONFIG.update(CONFIG_DEFAULTS)
+CONFIG.update(getattr(settings, 'DEBUG_TOOLBAR_CONFIG', {}))
+
+
+PANELS_DEFAULTS = (
+    'debug_toolbar.panels.version.VersionDebugPanel',
+    'debug_toolbar.panels.timer.TimerDebugPanel',
+    'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
+    'debug_toolbar.panels.headers.HeaderDebugPanel',
+    'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
+    'debug_toolbar.panels.sql.SQLDebugPanel',
+    'debug_toolbar.panels.template.TemplateDebugPanel',
+    'debug_toolbar.panels.cache.CacheDebugPanel',
+    'debug_toolbar.panels.signals.SignalDebugPanel',
+    'debug_toolbar.panels.logger.LoggingPanel',
+    'debug_toolbar.panels.redirects.InterceptRedirectsPanel',
+)
+
+
+PANELS = getattr(settings, 'DEBUG_TOOLBAR_PANELS', PANELS_DEFAULTS)
diff --git a/debug_toolbar/toolbar.py b/debug_toolbar/toolbar.py
index 7041610..3d24891 100644
--- a/debug_toolbar/toolbar.py
+++ b/debug_toolbar/toolbar.py
@@ -13,7 +13,7 @@ from django.template.loader import render_to_string
 from django.utils.datastructures import SortedDict
 from django.utils.importlib import import_module
 
-from debug_toolbar.utils import settings as dt_settings
+from debug_toolbar import settings as dt_settings
 
 
 class DebugToolbar(object):
diff --git a/debug_toolbar/utils/settings.py b/debug_toolbar/utils/settings.py
deleted file mode 100644
index 237f2c8..0000000
--- a/debug_toolbar/utils/settings.py
+++ /dev/null
@@ -1,55 +0,0 @@
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.utils import six
-
-
-# Always import this module as follows:
-# from debug_toolbar.utils import settings [as dt_settings]
-
-# Don't import directly CONFIG or PANELs, or you will miss changes performed
-# with override_settings in tests.
-
-
-CONFIG_DEFAULTS = {
-    'INTERCEPT_REDIRECTS': False,
-    'SHOW_TOOLBAR_CALLBACK': None,
-    'EXTRA_SIGNALS': [],
-    'HIDE_DJANGO_SQL': True,
-    'SHOW_TEMPLATE_CONTEXT': True,
-    'TAG': 'body',
-    'ENABLE_STACKTRACES': True,
-    'HIDDEN_STACKTRACE_MODULES': (
-        'socketserver' if six.PY3 else 'SocketServer',
-        'threading',
-        'wsgiref',
-        'debug_toolbar',
-    ),
-    'ROOT_TAG_ATTRS': '',
-    'SQL_WARNING_THRESHOLD': 500,   # milliseconds
-    'RESULTS_CACHE_SIZE': 10,
-    'RENDER_PANELS': None,
-}
-
-
-CONFIG = {}
-CONFIG.update(CONFIG_DEFAULTS)
-CONFIG.update(getattr(settings, 'DEBUG_TOOLBAR_CONFIG', {}))
-
-
-PANELS_DEFAULTS = (
-    'debug_toolbar.panels.version.VersionDebugPanel',
-    'debug_toolbar.panels.timer.TimerDebugPanel',
-    'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
-    'debug_toolbar.panels.headers.HeaderDebugPanel',
-    'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
-    'debug_toolbar.panels.sql.SQLDebugPanel',
-    'debug_toolbar.panels.template.TemplateDebugPanel',
-    'debug_toolbar.panels.cache.CacheDebugPanel',
-    'debug_toolbar.panels.signals.SignalDebugPanel',
-    'debug_toolbar.panels.logger.LoggingPanel',
-    'debug_toolbar.panels.redirects.InterceptRedirectsPanel',
-)
-
-
-PANELS = getattr(settings, 'DEBUG_TOOLBAR_PANELS', PANELS_DEFAULTS)
-- 
cgit v1.2.3