diff options
| author | Aymeric Augustin | 2013-11-12 21:42:12 +0100 |
|---|---|---|
| committer | Aymeric Augustin | 2013-11-12 21:42:12 +0100 |
| commit | 02716d9ca2728e33e92806f6ed0b3d9375df53a9 (patch) | |
| tree | ceb3f1145a8fac75b92fdc980cde539a391fc5fc | |
| parent | aebf8990e1e9b933f52d44348a02879c14f12577 (diff) | |
| download | django-debug-toolbar-02716d9ca2728e33e92806f6ed0b3d9375df53a9.tar.bz2 | |
Remove unnecessary nesting.
| -rw-r--r-- | debug_toolbar/middleware.py | 2 | ||||
| -rw-r--r-- | debug_toolbar/models.py | 2 | ||||
| -rw-r--r-- | debug_toolbar/toolbar.py (renamed from debug_toolbar/toolbar/loader.py) | 0 | ||||
| -rw-r--r-- | debug_toolbar/toolbar/__init__.py | 0 | ||||
| -rw-r--r-- | debug_toolbar/views.py | 2 | ||||
| -rw-r--r-- | tests/__init__.py | 2 | ||||
| -rw-r--r-- | tests/base.py | 2 |
7 files changed, 5 insertions, 5 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): diff --git a/tests/__init__.py b/tests/__init__.py index 47fba24..0abb8a3 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.utils.settings import CONFIG, CONFIG_DEFAULTS -from debug_toolbar.toolbar.loader import load_panel_classes, panel_classes # noqa +from debug_toolbar.toolbar import load_panel_classes, panel_classes # noqa from django.dispatch import receiver from django.test.signals import setting_changed diff --git a/tests/base.py b/tests/base.py index e6f6dac..a1a59cc 100644 --- a/tests/base.py +++ b/tests/base.py @@ -6,7 +6,7 @@ from django.http import HttpResponse from django.test import TestCase, RequestFactory from debug_toolbar.middleware import DebugToolbarMiddleware -from debug_toolbar.toolbar.loader import DebugToolbar +from debug_toolbar.toolbar import DebugToolbar rf = RequestFactory() |