diff options
Diffstat (limited to 'debug_toolbar')
| -rw-r--r-- | debug_toolbar/middleware.py | 5 | ||||
| -rw-r--r-- | debug_toolbar/panels/profiling.py | 3 |
2 files changed, 3 insertions, 5 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, |