diff options
| -rw-r--r-- | debug_toolbar/middleware.py | 5 | ||||
| -rw-r--r-- | debug_toolbar/panels/profiling.py | 3 | ||||
| -rw-r--r-- | tests/tests.py | 20 |
3 files changed, 14 insertions, 14 deletions
diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py index 05d8e80..0c6821f 100644 --- a/debug_toolbar/middleware.py +++ b/debug_toolbar/middleware.py @@ -69,10 +69,7 @@ class DebugToolbarMiddleware(object): remote_addr = request.META.get('REMOTE_ADDR', None) # if not internal ip, and not DEBUG - if not (remote_addr in settings.INTERNAL_IPS or settings.DEBUG): - return False - - return True + return remote_addr in settings.INTERNAL_IPS and bool(settings.DEBUG) def process_request(self, request): __traceback_hide__ = True diff --git a/debug_toolbar/panels/profiling.py b/debug_toolbar/panels/profiling.py index b3dedf8..289e1f7 100644 --- a/debug_toolbar/panels/profiling.py +++ b/debug_toolbar/panels/profiling.py @@ -16,6 +16,7 @@ from cStringIO import StringIO import cProfile from pstats import Stats from colorsys import hsv_to_rgb +import os class DjangoDebugToolbarStats(Stats): __root = None @@ -64,7 +65,7 @@ class FunctionCall(object): if idx > -1: file_name=file_name[idx+14:] - file_path, file_name = file_name.rsplit('/', 1) + file_path, file_name = file_name.rsplit(os.sep, 1) return mark_safe('<span class="path">{0}/</span><span class="file">{1}</span> in <span class="func">{3}</span>(<span class="lineno">{2}</span>)'.format( file_path, diff --git a/tests/tests.py b/tests/tests.py index 80fda7d..6f7de0d 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -55,23 +55,25 @@ class DebugToolbarTestCase(BaseTestCase): def test_show_toolbar_DEBUG(self): request = self.request + request.META = {'REMOTE_ADDR': '127.0.0.1'} middleware = DebugToolbarMiddleware() - with Settings(DEBUG=True): + with Settings(INTERNAL_IPS=['127.0.0.1'], DEBUG=True): self.assertTrue(middleware._show_toolbar(request)) - with Settings(DEBUG=False): + with Settings(INTERNAL_IPS=['127.0.0.1'], DEBUG=False): self.assertFalse(middleware._show_toolbar(request)) def test_show_toolbar_TEST(self): request = self.request + request.META = {'REMOTE_ADDR': '127.0.0.1'} middleware = DebugToolbarMiddleware() - with Settings(TEST=True, DEBUG=True): + with Settings(INTERNAL_IPS=['127.0.0.1'], TEST=True, DEBUG=True): self.assertFalse(middleware._show_toolbar(request)) - with Settings(TEST=False, DEBUG=True): + with Settings(INTERNAL_IPS=['127.0.0.1'], TEST=False, DEBUG=True): self.assertTrue(middleware._show_toolbar(request)) def test_show_toolbar_INTERNAL_IPS(self): @@ -80,10 +82,10 @@ class DebugToolbarTestCase(BaseTestCase): request.META = {'REMOTE_ADDR': '127.0.0.1'} middleware = DebugToolbarMiddleware() - with Settings(INTERNAL_IPS=['127.0.0.1']): + with Settings(INTERNAL_IPS=['127.0.0.1'], DEBUG=True): self.assertTrue(middleware._show_toolbar(request)) - with Settings(INTERNAL_IPS=[]): + with Settings(INTERNAL_IPS=[], DEBUG=True): self.assertFalse(middleware._show_toolbar(request)) def test_request_urlconf_string(self): @@ -93,7 +95,7 @@ class DebugToolbarTestCase(BaseTestCase): request.META = {'REMOTE_ADDR': '127.0.0.1'} middleware = DebugToolbarMiddleware() - with Settings(DEBUG=True): + with Settings(INTERNAL_IPS=['127.0.0.1'], DEBUG=True): middleware.process_request(request) self.assertFalse(isinstance(request.urlconf, basestring)) @@ -109,7 +111,7 @@ class DebugToolbarTestCase(BaseTestCase): request.META = {'REMOTE_ADDR': '127.0.0.1'} middleware = DebugToolbarMiddleware() - with Settings(DEBUG=True): + with Settings(INTERNAL_IPS=['127.0.0.1'], DEBUG=True): middleware.process_request(request) request.urlconf = 'debug_toolbar.urls' middleware.process_request(request) @@ -127,7 +129,7 @@ class DebugToolbarTestCase(BaseTestCase): request.META = {'REMOTE_ADDR': '127.0.0.1'} middleware = DebugToolbarMiddleware() - with Settings(DEBUG=True): + with Settings(INTERNAL_IPS=['127.0.0.1'], DEBUG=True): middleware.process_request(request) self.assertFalse(isinstance(request.urlconf, basestring)) |