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/models.py2
-rw-r--r--debug_toolbar/toolbar.py (renamed from debug_toolbar/toolbar/loader.py)0
-rw-r--r--debug_toolbar/toolbar/__init__.py0
-rw-r--r--debug_toolbar/views.py2
5 files changed, 3 insertions, 3 deletions
diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index c95cade..80e8ae0 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -11,7 +11,7 @@ from django.http import HttpResponseRedirect
from django.shortcuts import render
from django.utils.encoding import force_text
-from debug_toolbar.toolbar.loader import DebugToolbar
+from debug_toolbar.toolbar import DebugToolbar
from debug_toolbar.utils.settings import CONFIG
_HTML_TYPES = ('text/html', 'application/xhtml+xml')
diff --git a/debug_toolbar/models.py b/debug_toolbar/models.py
index fc78874..d39e7ec 100644
--- a/debug_toolbar/models.py
+++ b/debug_toolbar/models.py
@@ -5,7 +5,7 @@ from django.conf.urls import include, patterns, url
from django.core.urlresolvers import reverse, NoReverseMatch
from django.utils.importlib import import_module
-from debug_toolbar.toolbar.loader import load_panel_classes
+from debug_toolbar.toolbar import load_panel_classes
from debug_toolbar.middleware import DebugToolbarMiddleware
diff --git a/debug_toolbar/toolbar/loader.py b/debug_toolbar/toolbar.py
index f9262f8..f9262f8 100644
--- a/debug_toolbar/toolbar/loader.py
+++ b/debug_toolbar/toolbar.py
diff --git a/debug_toolbar/toolbar/__init__.py b/debug_toolbar/toolbar/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/debug_toolbar/toolbar/__init__.py
+++ /dev/null
diff --git a/debug_toolbar/views.py b/debug_toolbar/views.py
index 21f4747..83432bf 100644
--- a/debug_toolbar/views.py
+++ b/debug_toolbar/views.py
@@ -13,7 +13,7 @@ from django.utils.translation import ugettext as _
from django.views.decorators.csrf import csrf_exempt
from debug_toolbar.forms import SQLSelectForm
-from debug_toolbar.toolbar.loader import get_saved_toolbar
+from debug_toolbar.toolbar import get_saved_toolbar
def render_panel(request):