diff options
| author | Alex Gaynor | 2009-09-25 22:47:39 -0400 | 
|---|---|---|
| committer | Alex Gaynor | 2009-09-25 22:47:39 -0400 | 
| commit | 0c8e7a486088139597590acc96e13a9ec0ec3f46 (patch) | |
| tree | 0240ff6a0b21c25d6b52850d9dc93046796da2fc | |
| parent | 776308429ec1ef227c9f3fbba5fd4f6819cb7bd4 (diff) | |
| parent | 97c1240a8fbeb6ed374b94a0bc630bca8a7e1d6b (diff) | |
| download | django-debug-toolbar-0c8e7a486088139597590acc96e13a9ec0ec3f46.tar.bz2 | |
Merge commit 'rob/master'
| -rw-r--r-- | debug_toolbar/panels/request_vars.py | 6 | ||||
| -rw-r--r-- | debug_toolbar/panels/template.py | 2 | 
2 files changed, 4 insertions, 4 deletions
| diff --git a/debug_toolbar/panels/request_vars.py b/debug_toolbar/panels/request_vars.py index 4ee30a1..3f6aea5 100644 --- a/debug_toolbar/panels/request_vars.py +++ b/debug_toolbar/panels/request_vars.py @@ -10,10 +10,10 @@ class RequestVarsDebugPanel(DebugPanel):      def nav_title(self):          return 'Request Vars' -     +      def title(self):          return 'Request Vars' -     +      def url(self):          return '' @@ -27,6 +27,6 @@ class RequestVarsDebugPanel(DebugPanel):              'cookies': [(k, self.request.COOKIES.get(k)) for k in self.request.COOKIES.iterkeys()],          }          if hasattr(self.request, 'session'): -            context['session'] = [(k, self.request.session.get(k)) for k in self.request.session.iterkeys()], +            context['session'] = [(k, self.request.session.get(k)) for k in self.request.session.iterkeys()]          return render_to_string('debug_toolbar/panels/request_vars.html', context) diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py index f090c78..34a1897 100644 --- a/debug_toolbar/panels/template.py +++ b/debug_toolbar/panels/template.py @@ -83,7 +83,7 @@ class TemplateDebugPanel(DebugPanel):                  d_list = []                  for _d in c.dicts:                      try: -                        d_list.append(pformat(d)) +                        d_list.append(pformat(_d))                      except UnicodeEncodeError:                          pass                  info['context'] = '\n'.join(d_list) | 
