Minor cleanup of imports and long lines.

jazzband · Mar 26, 2009 · dedf8a9 · dedf8a9
1 parent ea1f943
commit dedf8a9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
@@ -1,15 +1,16 @@
 """
 Debug Toolbar middleware
 """
+import os
+
 from django.conf import settings
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response
 from django.utils.encoding import smart_unicode
 from django.conf.urls.defaults import include, patterns
+
 import debug_toolbar.urls
 from debug_toolbar.toolbar.loader import DebugToolbar
-from debug_toolbar.urls import DEBUG_TB_URL_PREFIX
-import os
 
 _HTML_TYPES = ('text/html', 'application/xhtml+xml')
 
@@ -39,8 +40,10 @@ def __init__(self):
     def show_toolbar(self, request):
         if not settings.DEBUG:
             return False
-        if request.is_ajax() and not request.path.startswith(os.path.join('/', DEBUG_TB_URL_PREFIX)): #Allow ajax requests from the debug toolbar
+        if request.is_ajax() and not \
-            return False
+            request.path.startswith(os.path.join('/', debug_toolbar.urls._PREFIX)):
+            # Allow ajax requests from the debug toolbar
+            return False 
         if not request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS:
             return False
         return True

diff --git a/debug_toolbar/urls.py b/debug_toolbar/urls.py
@@ -7,12 +7,12 @@
 from django.conf.urls.defaults import *
 from django.conf import settings
 
-DEBUG_TB_URL_PREFIX = '__debug__'
+_PREFIX = '__debug__'
 
 urlpatterns = patterns('',
-    url(r'^%s/m/(.*)$' % DEBUG_TB_URL_PREFIX, 'debug_toolbar.views.debug_media'),
+    url(r'^%s/m/(.*)$' % _PREFIX, 'debug_toolbar.views.debug_media'),
-    url(r'^%s/sql_select/$' % DEBUG_TB_URL_PREFIX, 'debug_toolbar.views.sql_select', name='sql_select'),
+    url(r'^%s/sql_select/$' % _PREFIX, 'debug_toolbar.views.sql_select', name='sql_select'),
-    url(r'^%s/sql_explain/$' % DEBUG_TB_URL_PREFIX, 'debug_toolbar.views.sql_explain', name='sql_explain'),
+    url(r'^%s/sql_explain/$' % _PREFIX, 'debug_toolbar.views.sql_explain', name='sql_explain'),
-    url(r'^%s/sql_profile/$' % DEBUG_TB_URL_PREFIX, 'debug_toolbar.views.sql_profile', name='sql_profile'),
+    url(r'^%s/sql_profile/$' % _PREFIX, 'debug_toolbar.views.sql_profile', name='sql_profile'),
-    url(r'^%s/template_source/$' % DEBUG_TB_URL_PREFIX, 'debug_toolbar.views.template_source', name='template_source'),
+    url(r'^%s/template_source/$' % _PREFIX, 'debug_toolbar.views.template_source', name='template_source'),
 )