Skip to content

fixes open issue #180 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jbruce12000 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fixes open issue #180 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08360b7
- check for view_func, view_args, view_kwargs and request attrs befor…
jbruce12000 Jun 28, 2011
9a34d12
- check view_func for __name__ before using it
jbruce12000 Aug 30, 2011
17569a9
- upped the version number
jbruce12000 Aug 30, 2011
2d7211a
guard two places with hasattr
Sep 14, 2011
aa4c699
update version
Sep 14, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion debug_toolbar/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
VERSION = (0, 8, 5)
VERSION = (0, 8, 7)
__version__ = '.'.join(map(str, VERSION))
22 changes: 14 additions & 8 deletions debug_toolbar/panels/request_vars.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,20 @@ def process_view(self, request, view_func, view_args, view_kwargs):

def content(self):
context = self.context.copy()
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__, self.view_func.__name__),
'view_args': self.view_args,
'view_kwargs': self.view_kwargs
})

if self.request:
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],
})
if hasattr(self, 'view_args'):
context.update({ 'view_args': self.view_args })
if hasattr(self, 'view_kwargs'):
context.update({ 'view_kwargs': self.view_kwargs })
if hasattr(self, 'view_func'):
if hasattr(self.view_func,'__module__') and hasattr(self.view_func,'__name__'):
context.update({'view_func': '%s.%s' % (self.view_func.__module__, self.view_func.__name__)})
if hasattr(self.request, 'session'):
context.update({
'session': [(k, self.request.session.get(k)) for k in self.request.session.iterkeys()]
Expand Down
4 changes: 2 additions & 2 deletions debug_toolbar/panels/template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ def content(self):
# Clean up some info about templates
template = template_data.get('template', None)
# Skip templates that we are generating through the debug toolbar.
if template.name and template.name.startswith('debug_toolbar/'):
if hasattr(template, 'name') and template.name.startswith('debug_toolbar/'):
continue
if template.origin and template.origin.name:
if hasattr(template, 'origin') and hasattr(template.origin, 'name'):
template.origin_name = template.origin.name
else:
template.origin_name = 'No origin'
Expand Down