From 6b0d32f7066cac5b6cb92e383eb486a3aa666d03 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin
Date: Sun, 24 Nov 2013 12:27:37 +0100
Subject: Fix cyclic import issues in db2de5b.

---
 debug_toolbar/middleware.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'debug_toolbar/middleware.py')

diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index b7114af..b58f588 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -8,6 +8,7 @@ import threading
 
 from django.conf import settings
 from django.utils.encoding import force_text
+from django.utils.importlib import import_module
 
 from debug_toolbar.toolbar import DebugToolbar
 from debug_toolbar import settings as dt_settings
@@ -38,7 +39,11 @@ class DebugToolbarMiddleware(object):
     debug_toolbars = {}
 
     def process_request(self, request):
-        if not dt_settings.CONFIG['SHOW_TOOLBAR_CALLBACK'](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)
+        if not show_toolbar(request):
             return
         response = None
         toolbar = DebugToolbar(request)
-- 
cgit v1.2.3