Drop obsolete conditional code.

Author: aaugustin

debug_toolbar/middleware.py

@@ -6,11 +6,11 @@
 
 import re
 import threading
-from importlib import import_module
 
 from django.conf import settings
 from django.utils import six
 from django.utils.encoding import force_text
+from django.utils.module_loading import import_string
 
 from debug_toolbar import settings as dt_settings
 from debug_toolbar.toolbar import DebugToolbar
@@ -45,9 +45,7 @@ def __init__(self):
         # setup, resolve it to the corresponding callable.
         func_or_path = dt_settings.CONFIG['SHOW_TOOLBAR_CALLBACK']
         if isinstance(func_or_path, six.string_types):
-            # Replace this with import_by_path in Django >= 1.6.
-            mod_path, func_name = func_or_path.rsplit('.', 1)
-            self.show_toolbar = getattr(import_module(mod_path), func_name)
+            self.show_toolbar = import_string(func_or_path)
         else:
             self.show_toolbar = func_or_path
 

debug_toolbar/panels/redirects.py

@@ -1,6 +1,5 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.core.handlers.wsgi import STATUS_CODE_TEXT
 from django.shortcuts import render_to_response
 from django.utils.translation import ugettext_lazy as _
 
@@ -20,12 +19,7 @@ def process_response(self, request, response):
         if 300 <= int(response.status_code) < 400:
             redirect_to = response.get('Location', None)
             if redirect_to:
-                try:        # Django >= 1.6
-                    reason_phrase = response.reason_phrase
-                except AttributeError:
-                    reason_phrase = STATUS_CODE_TEXT.get(response.status_code,
-                                                         'UNKNOWN STATUS CODE')
-                status_line = '%s %s' % (response.status_code, reason_phrase)
+                status_line = '%s %s' % (response.status_code, response.reason_phrase)
                 cookies = response.cookies
                 context = {'redirect_to': redirect_to, 'status_line': status_line}
                 response = render_to_response('debug_toolbar/redirect.html', context)

debug_toolbar/settings.py

@@ -5,6 +5,7 @@
 
 from django.conf import settings
 from django.utils import six
+from django.utils.module_loading import import_string
 
 # Always import this module as follows:
 # from debug_toolbar import settings [as dt_settings]
@@ -174,12 +175,9 @@ 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)
-    except (AttributeError, ImportError, ValueError):
+        middleware_cls = import_string(middleware_path)
+    except ImportError:
         return
     return issubclass(middleware_cls, middleware_class)
 

tests/panels/test_profiling.py

@@ -49,9 +49,6 @@ def test_view_executed_once(self):
         self.assertEqual(User.objects.count(), 1)
 
         with self.assertRaises(IntegrityError):
-            if hasattr(transaction, 'atomic'):      # Django >= 1.6
-                with transaction.atomic():
-                    response = self.client.get('/new_user/')
-            else:
+            with transaction.atomic():
                 response = self.client.get('/new_user/')
         self.assertEqual(User.objects.count(), 1)