Merge branch 'master' of github.com:django-debug-toolbar/django-debug-toolbar

1 files changed, 12 insertions, 6 deletions

diff --git a/debug_toolbar/panels/request_vars.py b/debug_toolbar/panels/request_vars.py
index 632068e..60214ae 100644
--- a/debug_toolbar/panels/request_vars.py
+++ b/debug_toolbar/panels/request_vars.py
@@ -9,6 +9,12 @@ class RequestVarsDebugPanel(DebugPanel):
     name = 'RequestVars'
     has_content = True
 
+    def __init__(self, *args, **kwargs):
+        DebugPanel.__init__(self, *args, **kwargs)
+        self.view_func = None
+        self.view_args = None
+        self.view_kwargs = None
+
     def nav_title(self):
         return _('Request Vars')
 
@@ -29,18 +35,18 @@ class RequestVarsDebugPanel(DebugPanel):
     def content(self):
         context = self.context.copy()
 
-        if hasattr(self.view_func, '__name__'):
-            view_name = self.view_func.__name__
-        elif hasattr(self.view_func, '__class__'):
-            view_name = self.view_func.__class__.__name__
+        if self.view_func is not None:
+            module = self.view_func.__module__
+            name = getattr(self.view_func, '__name__', None) or getattr(self.view_func.__class__,'__name__','<unknown>')
+            view_func = '%s.%s' % (module, name)
         else:
-            view_name = '<unknown>'
+            view_func = '<no view>'
 
         context.update({
             'get': [(k, self.request.GET.getlist(k)) for k in self.request.GET],
             'post': [(k, self.request.POST.getlist(k)) for k in self.request.POST],
             'cookies': [(k, self.request.COOKIES.get(k)) for k in self.request.COOKIES],
-            'view_func': '%s.%s' % (self.view_func.__module__, view_name),
+            'view_func': view_func,
             'view_args': self.view_args,
             'view_kwargs': self.view_kwargs
         })