aboutsummaryrefslogtreecommitdiffstats
path: root/debug_toolbar/middleware.py
diff options
context:
space:
mode:
authorDavid Cramer2011-05-26 12:43:51 -0700
committerDavid Cramer2011-05-26 12:43:51 -0700
commit34d03283327d58342f0c1d72ee7bb7d029dc8815 (patch)
tree9783d1469368a45f9f0630d3c1a895c9eae261e5 /debug_toolbar/middleware.py
parent3719bbec31a085f9a91e58cdc1ebd2771f3c8ea5 (diff)
downloaddjango-debug-toolbar-34d03283327d58342f0c1d72ee7bb7d029dc8815.tar.bz2
Update TEST check to correct behavior (dont show toolbar under TEST)
Diffstat (limited to 'debug_toolbar/middleware.py')
-rw-r--r--debug_toolbar/middleware.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index b1ab737..fa64a16 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -58,14 +58,19 @@ class DebugToolbarMiddleware(object):
self.tag = u'</' + tag + u'>'
def _show_toolbar(self, request):
+ if getattr(settings, 'TEST', False):
+ return False
+
x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR', None)
if x_forwarded_for:
remote_addr = x_forwarded_for.split(',')[0].strip()
else:
remote_addr = request.META.get('REMOTE_ADDR', None)
- # if not internal ip, and not DEBUG or TEST
- if not (remote_addr in settings.INTERNAL_IPS or settings.DEBUG or getattr(settings, 'TEST', False)):
+
+ # if not internal ip, and not DEBUG
+ if not (remote_addr in settings.INTERNAL_IPS or settings.DEBUG):
return False
+
return True
def process_request(self, request):