aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cramer2011-05-26 02:22:33 -0700
committerDavid Cramer2011-05-26 02:22:33 -0700
commit5c6dbbc40a679b6bd5b7e81f7968d7ca54e3cab4 (patch)
tree1b808531a8a18ba78b46e9f4a9e030bfcab8cfb2
parent13c2043af8a6d82f8260ea8d190b1e4c0624f1f7 (diff)
parentb5cbaa4a6a890fd9ac1d8c8b302340ef6ee0ee98 (diff)
downloaddjango-debug-toolbar-5c6dbbc40a679b6bd5b7e81f7968d7ca54e3cab4.tar.bz2
Merge pull request #167 from cooyeah/master
toolbar should be disabled when settings.TEST is True
-rw-r--r--debug_toolbar/middleware.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index de4ae9c..3089b63 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -65,7 +65,7 @@ class DebugToolbarMiddleware(object):
if not remote_addr in settings.INTERNAL_IPS \
or (request.is_ajax() and \
not debug_toolbar.urls._PREFIX in request.path) \
- or not (settings.DEBUG or getattr(settings, 'TEST', False)):
+ or not (settings.DEBUG and not getattr(settings, 'TEST', False)):
return False
return True