Various cleanup of utilities

Author: dcramer

debug_toolbar/middleware.py

@@ -4,18 +4,16 @@
 
 from __future__ import absolute_import, unicode_literals
 
-try:
-    from importlib import import_module
-except ImportError:  # python 2.6
-    from django.utils.importlib import import_module
 import re
 import threading
 
 from django.conf import settings
+from django.utils import six
 from django.utils.encoding import force_text
 
-from debug_toolbar.toolbar import DebugToolbar
 from debug_toolbar import settings as dt_settings
+from debug_toolbar.toolbar import DebugToolbar
+from debug_toolbar.utils.imports import import_string
 
 _HTML_TYPES = ('text/html', 'application/xhtml+xml')
 # Handles python threading module bug - http://bugs.python.org/issue14308
@@ -44,10 +42,11 @@ class DebugToolbarMiddleware(object):
 
     def process_request(self, request):
         # Decide whether the toolbar is active for this request.
-        func_path = dt_settings.CONFIG['SHOW_TOOLBAR_CALLBACK']
-        # Replace this with import_by_path in Django >= 1.6.
-        mod_path, func_name = func_path.rsplit('.', 1)
-        show_toolbar = getattr(import_module(mod_path), func_name)
+        show_toolbar = dt_settings.CONFIG['SHOW_TOOLBAR_CALLBACK']
+
+        if isinstance(show_toolbar, six.string_types):
+            show_toolbar = import_string(func_path)
+
         if not show_toolbar(request):
             return
 

debug_toolbar/panels/__init__.py

@@ -1,12 +1,14 @@
 from __future__ import absolute_import, unicode_literals
 
+import operator
 import warnings
 
 from django.template.loader import render_to_string
+from django.utils.translation import ungettext
 
 from debug_toolbar import settings as dt_settings
-from debug_toolbar.utils import get_name_from_obj
 from debug_toolbar.utils.function_wrapper import FunctionWrapper
+from debug_toolbar.utils.imports import get_name_from_obj
 from debug_toolbar.utils.patch_context import PatchContext
 
 
@@ -203,3 +205,12 @@ def enable_instrumentation(self):
     def disable_instrumentation(self):
         for context in self._context:
             context.unpatch()
+
+    @property
+    def nav_subtitle(self):
+        calls = len(self.calls)
+        duration = int(sum(((c['end'] - c['start']) for c in self.calls)) * 1000)
+
+        return ungettext('%(calls)d call in %(duration).2fms',
+                         '%(calls)d calls in %(duration).2fms',
+                         calls) % {'calls': calls, 'duration': duration}

debug_toolbar/panels/cache.py

@@ -16,8 +16,9 @@
     from django.utils.datastructures import SortedDict as OrderedDict
 
 from debug_toolbar.panels import Panel
-from debug_toolbar.utils import (tidy_stacktrace, render_stacktrace,
-                                 get_template_info, get_stack)
+from debug_toolbar.utils.stacktraces import (tidy_stacktrace, render_stacktrace,
+                                             get_stack)
+from debug_toolbar.utils.templates import get_template_info
 from debug_toolbar import settings as dt_settings
 
 

debug_toolbar/panels/logging.py

@@ -8,7 +8,7 @@
     threading = None
 from django.utils.translation import ungettext, ugettext_lazy as _
 from debug_toolbar.panels import Panel
-from debug_toolbar.utils import ThreadCollector
+from debug_toolbar.utils.thread_collector import ThreadCollector
 
 MESSAGE_IF_STRING_REPRESENTATION_INVALID = '[Could not get log message]'
 

debug_toolbar/panels/request.py

@@ -6,7 +6,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from debug_toolbar.panels import Panel
-from debug_toolbar.utils import get_name_from_obj
+from debug_toolbar.utils.imports import get_name_from_obj
 
 
 class RequestPanel(Panel):

debug_toolbar/panels/signals.py

@@ -1,9 +1,5 @@
 from __future__ import absolute_import, unicode_literals
 
-try:
-    from importlib import import_module
-except ImportError:  # python 2.6
-    from django.utils.importlib import import_module
 
 from django.core.signals import (
     request_started, request_finished, got_request_exception)
@@ -19,6 +15,7 @@
 from django.utils.translation import ugettext_lazy as _, ungettext
 
 from debug_toolbar.panels import Panel
+from debug_toolbar.utils.imports import import_string
 
 
 class SignalsPanel(Panel):
@@ -60,9 +57,7 @@ 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)
+            signals[signal_name] = import_string(signal)
         return signals
 
     def process_response(self, request, response):

debug_toolbar/panels/sql/panel.py

@@ -10,10 +10,10 @@
 
 from debug_toolbar.panels import Panel
 from debug_toolbar.panels.sql.forms import SQLSelectForm
-from debug_toolbar.utils import render_stacktrace
 from debug_toolbar.panels.sql.utils import reformat_sql, contrasting_color_generator
 from debug_toolbar.panels.sql.tracking import wrap_cursor, unwrap_cursor
 from debug_toolbar.panels.sql import views
+from debug_toolbar.utils.stacktraces import render_stacktrace
 
 
 def get_isolation_level_display(vendor, level):

debug_toolbar/panels/sql/tracking.py

@@ -7,8 +7,9 @@
 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 import settings as dt_settings
+from debug_toolbar.utils.stacktraces import tidy_stacktrace, get_stack
+from debug_toolbar.utils.templates import get_template_info
 
 
 class SQLQueryTriggered(Exception):

debug_toolbar/panels/staticfiles.py

@@ -19,7 +19,7 @@
     from django.utils.datastructures import SortedDict as OrderedDict
 
 from debug_toolbar import panels
-from debug_toolbar.utils import ThreadCollector
+from debug_toolbar.utils.thread_collector import ThreadCollector
 
 
 @python_2_unicode_compatible

debug_toolbar/panels/versions.py

@@ -1,9 +1,5 @@
 from __future__ import absolute_import, unicode_literals
 
-try:
-    from importlib import import_module
-except ImportError:  # python 2.6
-    from django.utils.importlib import import_module
 import sys
 
 import django
@@ -15,6 +11,7 @@
     from django.utils.datastructures import SortedDict as OrderedDict
 
 from debug_toolbar.panels import Panel
+from debug_toolbar.utils.imports import import_string
 
 
 class VersionsPanel(Panel):
@@ -55,7 +52,7 @@ def gen_app_versions_1_7(self):
     def gen_app_versions_1_6(self):
         for app in list(settings.INSTALLED_APPS):
             name = app.split('.')[-1].replace('_', ' ').capitalize()
-            app = import_module(app)
+            app = import_string(app)
             version = self.get_app_version(app)
             if version:
                 yield name, version

debug_toolbar/settings.py

@@ -1,14 +1,12 @@
 from __future__ import absolute_import, unicode_literals
 
-try:
-    from importlib import import_module
-except ImportError:  # python 2.6
-    from django.utils.importlib import import_module
 import warnings
 
 from django.conf import settings
 from django.utils import six
 
+from debug_toolbar.utils.imports import import_string
+
 
 # Always import this module as follows:
 # from debug_toolbar import settings [as dt_settings]
@@ -184,9 +182,7 @@ def check_middleware():
 def is_middleware_class(middleware_class, middleware_path):
     # This could be replaced by import_by_path in Django >= 1.6.
     try:
-        mod_path, cls_name = middleware_path.rsplit('.', 1)
-        mod = import_module(mod_path)
-        middleware_cls = getattr(mod, cls_name)
+        middleware_cls = import_string(middleware_path)
     except (AttributeError, ImportError, ValueError):
         return
     return issubclass(middleware_cls, middleware_class)
@@ -225,7 +221,7 @@ def patch_root_urlconf():
     try:
         reverse('djdt:render_panel')
     except NoReverseMatch:
-        urlconf_module = import_module(settings.ROOT_URLCONF)
+        urlconf_module = import_string(settings.ROOT_URLCONF)
         urlconf_module.urlpatterns = [
             url(r'^__debug__/', include(debug_toolbar.urls)),
         ] + urlconf_module.urlpatterns

debug_toolbar/toolbar.py

@@ -4,10 +4,6 @@
 
 from __future__ import absolute_import, unicode_literals
 
-try:
-    from importlib import import_module
-except ImportError:  # python 2.6
-    from django.utils.importlib import import_module
 import uuid
 
 import django
@@ -22,6 +18,7 @@
     from django.utils.datastructures import SortedDict as OrderedDict
 
 from debug_toolbar import settings as dt_settings
+from debug_toolbar.utils.imports import import_string
 
 
 class DebugToolbar(object):
@@ -125,23 +122,14 @@ def get_panel_classes(cls):
             panel_classes = []
             for panel_path in dt_settings.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)
+                    panel_class = import_string(panel_path)
                 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_path, e))
+
                 panel_classes.append(panel_class)
             cls._panel_classes = panel_classes
         return cls._panel_classes