diff options
| author | Aymeric Augustin | 2013-11-16 21:13:21 +0100 |
|---|---|---|
| committer | Aymeric Augustin | 2013-11-16 21:13:21 +0100 |
| commit | 715fe284da176618f5cd404665641d67dc6fc875 (patch) | |
| tree | da1df574fdbf67154d69dd6c6fad5f36665fc9b7 | |
| parent | ac1d552494f0161836139e8065ee0fa58077d796 (diff) | |
| download | django-debug-toolbar-715fe284da176618f5cd404665641d67dc6fc875.tar.bz2 | |
Flat is better than nested.
| -rw-r--r-- | debug_toolbar/middleware.py | 2 | ||||
| -rw-r--r-- | debug_toolbar/panels/cache.py | 2 | ||||
| -rw-r--r-- | debug_toolbar/panels/sql/tracking.py | 2 | ||||
| -rw-r--r-- | debug_toolbar/settings.py (renamed from debug_toolbar/utils/settings.py) | 2 | ||||
| -rw-r--r-- | debug_toolbar/toolbar.py | 2 | ||||
| -rw-r--r-- | tests/__init__.py | 2 |
6 files changed, 6 insertions, 6 deletions
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/utils/settings.py b/debug_toolbar/settings.py index 237f2c8..f284c76 100644 --- a/debug_toolbar/utils/settings.py +++ b/debug_toolbar/settings.py @@ -5,7 +5,7 @@ from django.utils import six # 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. 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/tests/__init__.py b/tests/__init__.py index 3bf8994..5be754e 100644 --- a/tests/__init__.py +++ b/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 |