summaryrefslogtreecommitdiffstats
path: root/askbot/middleware
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-09-16 22:50:31 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-09-16 22:50:31 -0400
commitcb3ed253980f0a08326b5584a79559560d51386e (patch)
tree76d527652659b532a7c220fcbd6f3e8efb050349 /askbot/middleware
parent8325c5f8e01ddf5b63c816e49f62d574b1cbb9cf (diff)
parentcb09dd64924628e0646342538d2512439b7c3eba (diff)
downloadaskbot-cb3ed253980f0a08326b5584a79559560d51386e.tar.gz
askbot-cb3ed253980f0a08326b5584a79559560d51386e.tar.bz2
askbot-cb3ed253980f0a08326b5584a79559560d51386e.zip
Merge branch 'github'
Diffstat (limited to 'askbot/middleware')
-rw-r--r--askbot/middleware/view_log.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/askbot/middleware/view_log.py b/askbot/middleware/view_log.py
index cf612ad2..d3e2d2f1 100644
--- a/askbot/middleware/view_log.py
+++ b/askbot/middleware/view_log.py
@@ -51,11 +51,12 @@ class ViewLogMiddleware(object):
if settings.DEBUG == True:
#todo: dependency!
- from debug_toolbar.views import debug_media as debug_media_view
- if view_func == debug_media_view:
- return
- else:
- view_str = view_func.__name__
+ try:
+ from debug_toolbar.views import debug_media as debug_media_view
+ if view_func == debug_media_view:
+ return
+ except ImportError:
+ pass
if request.user.is_authenticated():
user_name = request.user.username