Merge pull request #913 from jdufresne/import-string

Use Django's import_string so as to avoid re-implementing it

Author: matthiask

debug_toolbar/panels/signals.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 import weakref
-from importlib import import_module
 
 from django.core.signals import (
     got_request_exception, request_finished, request_started,
@@ -11,6 +10,7 @@
     class_prepared, post_delete, post_init, post_migrate, post_save,
     pre_delete, pre_init, pre_save,
 )
+from django.utils.module_loading import import_string
 from django.utils.translation import ugettext_lazy as _, ungettext
 
 from debug_toolbar.panels import Panel
@@ -55,16 +55,13 @@ def nav_subtitle(self):
     def signals(self):
         signals = self.SIGNALS.copy()
         for signal in self.toolbar.config['EXTRA_SIGNALS']:
-            mod_path, signal_name = signal.rsplit('.', 1)
-            signals_mod = import_module(mod_path)
-            signals[signal_name] = getattr(signals_mod, signal_name)
+            signal_name = signal.rsplit('.', 1)[-1]
+            signals[signal_name] = import_string(signal)
         return signals
 
     def generate_stats(self, request, response):
         signals = []
         for name, signal in sorted(self.signals.items(), key=lambda x: x[0]):
-            if signal is None:
-                continue
             receivers = []
             for receiver in signal.receivers:
                 receiver = receiver[1]

debug_toolbar/toolbar.py

@@ -6,13 +6,13 @@
 
 import uuid
 from collections import OrderedDict
-from importlib import import_module
 
 from django.apps import apps
 from django.conf.urls import url
 from django.core.exceptions import ImproperlyConfigured
 from django.template import TemplateSyntaxError
 from django.template.loader import render_to_string
+from django.utils.module_loading import import_string
 
 from debug_toolbar import settings as dt_settings
 
@@ -106,27 +106,10 @@ def fetch(cls, store_id):
     def get_panel_classes(cls):
         if cls._panel_classes is None:
             # Load panels in a temporary variable for thread safety.
-            panel_classes = []
-            for panel_path in dt_settings.get_panels():
-                # This logic could be replaced with import_by_path in Django 1.6.
-                try:
-                    panel_module, panel_classname = panel_path.rsplit('.', 1)
-                except ValueError:
-                    raise ImproperlyConfigured(
-                        "%s isn't a debug panel module" % panel_path)
-                try:
-                    mod = import_module(panel_module)
-                except ImportError as e:
-                    raise ImproperlyConfigured(
-                        'Error importing debug panel %s: "%s"' %
-                        (panel_module, e))
-                try:
-                    panel_class = getattr(mod, panel_classname)
-                except AttributeError:
-                    raise ImproperlyConfigured(
-                        'Toolbar Panel module "%s" does not define a "%s" class' %
-                        (panel_module, panel_classname))
-                panel_classes.append(panel_class)
+            panel_classes = [
+                import_string(panel_path)
+                for panel_path in dt_settings.get_panels()
+            ]
             cls._panel_classes = panel_classes
         return cls._panel_classes