Clean up DebugToolbar class, especially panels handling.

6 files changed, 8 insertions, 19 deletions

diff --git a/tests/panels/test_cache.py b/tests/panels/test_cache.py
index f3c359c..42a6814 100644
--- a/tests/panels/test_cache.py
+++ b/tests/panels/test_cache.py
@@ -4,8 +4,6 @@ from __future__ import unicode_literals
 
 from django.core import cache
 
-from debug_toolbar.panels.cache import CacheDebugPanel
-
 from ..base import BaseTestCase
 
 
@@ -13,7 +11,7 @@ class CachePanelTestCase(BaseTestCase):
 
     def setUp(self):
         super(CachePanelTestCase, self).setUp()
-        self.panel = self.toolbar.get_panel(CacheDebugPanel)
+        self.panel = self.toolbar.get_panel_by_id('CacheDebugPanel')
         self.panel.enable_instrumentation()
 
     def tearDown(self):
diff --git a/tests/panels/test_logger.py b/tests/panels/test_logger.py
index 9a3ac37..f5fe375 100644
--- a/tests/panels/test_logger.py
+++ b/tests/panels/test_logger.py
@@ -2,8 +2,7 @@ from __future__ import unicode_literals
 
 import logging
 
-from debug_toolbar.panels.logger import (
-    LoggingPanel, MESSAGE_IF_STRING_REPRESENTATION_INVALID)
+from debug_toolbar.panels.logger import MESSAGE_IF_STRING_REPRESENTATION_INVALID
 
 from ..base import BaseTestCase
 
@@ -12,7 +11,7 @@ class LoggingPanelTestCase(BaseTestCase):
 
     def setUp(self):
         super(LoggingPanelTestCase, self).setUp()
-        self.panel = self.toolbar.get_panel(LoggingPanel)
+        self.panel = self.toolbar.get_panel_by_id('LoggingPanel')
         self.logger = logging.getLogger(__name__)
 
     def test_happy_case(self):
diff --git a/tests/panels/test_request_vars.py b/tests/panels/test_request_vars.py
index 5366105..a86956f 100644
--- a/tests/panels/test_request_vars.py
+++ b/tests/panels/test_request_vars.py
@@ -4,8 +4,6 @@ from __future__ import unicode_literals
 
 from django.utils import six
 
-from debug_toolbar.panels.request_vars import RequestVarsDebugPanel
-
 from ..base import BaseTestCase
 
 
@@ -13,7 +11,7 @@ class RequestVarsDebugPanelTestCase(BaseTestCase):
 
     def setUp(self):
         super(RequestVarsDebugPanelTestCase, self).setUp()
-        self.panel = self.toolbar.get_panel(RequestVarsDebugPanel)
+        self.panel = self.toolbar.get_panel_by_id('RequestVarsDebugPanel')
 
     def test_non_ascii_session(self):
         self.request.session = {'où': 'où'}
diff --git a/tests/panels/test_sql.py b/tests/panels/test_sql.py
index 56b70dc..4a18a16 100644
--- a/tests/panels/test_sql.py
+++ b/tests/panels/test_sql.py
@@ -7,8 +7,6 @@ from django.db import connection
 from django.db.utils import DatabaseError
 from django.utils import unittest
 
-from debug_toolbar.panels.sql import SQLDebugPanel
-
 from ..base import BaseTestCase
 
 
@@ -16,7 +14,7 @@ class SQLPanelTestCase(BaseTestCase):
 
     def setUp(self):
         super(SQLPanelTestCase, self).setUp()
-        self.panel = self.toolbar.get_panel(SQLDebugPanel)
+        self.panel = self.toolbar.get_panel_by_id('SQLDebugPanel')
         self.panel.enable_instrumentation()
 
     def tearDown(self):
diff --git a/tests/panels/test_template.py b/tests/panels/test_template.py
index 545ad9b..1c43982 100644
--- a/tests/panels/test_template.py
+++ b/tests/panels/test_template.py
@@ -6,9 +6,6 @@ import django
 from django.contrib.auth.models import User
 from django.template import Template, Context
 
-from debug_toolbar.panels.template import TemplateDebugPanel
-from debug_toolbar.panels.sql import SQLDebugPanel
-
 from ..base import BaseTestCase
 from ..models import NonAsciiRepr
 
@@ -17,8 +14,8 @@ class TemplateDebugPanelTestCase(BaseTestCase):
 
     def setUp(self):
         super(TemplateDebugPanelTestCase, self).setUp()
-        self.panel = self.toolbar.get_panel(TemplateDebugPanel)
-        self.sql_panel = self.toolbar.get_panel(SQLDebugPanel)
+        self.panel = self.toolbar.get_panel_by_id('TemplateDebugPanel')
+        self.sql_panel = self.toolbar.get_panel_by_id('SQLDebugPanel')
         self.sql_panel.enable_instrumentation()
 
     def tearDown(self):
diff --git a/tests/test_integration.py b/tests/test_integration.py
index 412b14b..1885b35 100644
--- a/tests/test_integration.py
+++ b/tests/test_integration.py
@@ -8,7 +8,6 @@ from django.test import TestCase, RequestFactory
 from django.test.utils import override_settings
 
 from debug_toolbar.middleware import DebugToolbarMiddleware, show_toolbar
-from debug_toolbar.panels.request_vars import RequestVarsDebugPanel
 
 from .base import BaseTestCase
 from .views import regular_view
@@ -36,7 +35,7 @@ class DebugToolbarTestCase(BaseTestCase):
     def _resolve_stats(self, path):
         # takes stats from RequestVars panel
         self.request.path = path
-        panel = self.toolbar.get_panel(RequestVarsDebugPanel)
+        panel = self.toolbar.get_panel_by_id('RequestVarsDebugPanel')
         panel.process_request(self.request)
         panel.process_response(self.request, self.response)
         return self.toolbar.stats['requestvars']