aboutsummaryrefslogtreecommitdiffstats
path: root/debug_toolbar
diff options
context:
space:
mode:
Diffstat (limited to 'debug_toolbar')
-rw-r--r--debug_toolbar/middleware.py2
-rw-r--r--debug_toolbar/panels/cache.py2
-rw-r--r--debug_toolbar/panels/sql/tracking.py2
-rw-r--r--debug_toolbar/settings.py (renamed from debug_toolbar/utils/settings.py)2
-rw-r--r--debug_toolbar/toolbar.py2
5 files changed, 5 insertions, 5 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):