Merge pull request #940 from timb07/master

Fix circular import issue; #938

Author: matthiask

debug_toolbar/decorators.py

@@ -2,12 +2,12 @@
 
 from django.http import Http404
 
-from debug_toolbar.middleware import get_show_toolbar
-
 
 def require_show_toolbar(view):
     @functools.wraps(view)
     def inner(request, *args, **kwargs):
+        from debug_toolbar.middleware import get_show_toolbar
+
         show_toolbar = get_show_toolbar()
         if not show_toolbar(request):
             raise Http404