From b431d64f3b9722f7ae17f30f0168412d419c0d43 Mon Sep 17 00:00:00 2001 From: David Cramer Date: Tue, 14 Jun 2011 12:54:46 -0700 Subject: Moved view function name extraction into debug_toolbar.utils.get_name_from_obj --- debug_toolbar/panels/request_vars.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'debug_toolbar/panels') diff --git a/debug_toolbar/panels/request_vars.py b/debug_toolbar/panels/request_vars.py index 60214ae..6e7dd03 100644 --- a/debug_toolbar/panels/request_vars.py +++ b/debug_toolbar/panels/request_vars.py @@ -1,6 +1,8 @@ from django.template.loader import render_to_string from django.utils.translation import ugettext_lazy as _ + from debug_toolbar.panels import DebugPanel +from debug_toolbar.utils import get_name_from_obj class RequestVarsDebugPanel(DebugPanel): """ @@ -36,17 +38,15 @@ class RequestVarsDebugPanel(DebugPanel): context = self.context.copy() 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__','') - view_func = '%s.%s' % (module, name) + name = get_name_from_obj(self.view_func) else: - view_func = '' + name = '' 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': view_func, + 'view_func': name, 'view_args': self.view_args, 'view_kwargs': self.view_kwargs }) -- cgit v1.2.3