Flat is better than nested.

Author: aaugustin

debug_toolbar/middleware.py

@@ -10,7 +10,7 @@
 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

debug_toolbar/panels/cache.py

@@ -16,7 +16,7 @@
 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=[

debug_toolbar/panels/sql/tracking.py

@@ -11,7 +11,7 @@
 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):

debug_toolbar/utils/settings.py renamed to debug_toolbar/settings.py

@@ -5,7 +5,7 @@
 
 
 # Always import this module as follows:
-# from debug_toolbar.utils import settings [as dt_settings]
+# 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.

debug_toolbar/toolbar.py

@@ -13,7 +13,7 @@
 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):

tests/__init__.py

@@ -1,7 +1,7 @@
 # Refresh the debug toolbar's configuration when overriding settings.
 
 from debug_toolbar.toolbar import DebugToolbar
-from debug_toolbar.utils import settings as dt_settings
+from debug_toolbar import settings as dt_settings
 
 from django.dispatch import receiver
 from django.test.signals import setting_changed