Template panel context cleanup.

All panels get a copy of the template context when created and use an updated
copy when rendering so they can have full access to context vars and avoid
making changes to the shared context.

Signed-off-by: Rob Hudson <rob@cogit8.org>

1 files changed, 6 insertions, 3 deletions

diff --git a/debug_toolbar/panels/request_vars.py b/debug_toolbar/panels/request_vars.py
index cea5ec7..956e028 100644
--- a/debug_toolbar/panels/request_vars.py
+++ b/debug_toolbar/panels/request_vars.py
@@ -27,15 +27,18 @@ class RequestVarsDebugPanel(DebugPanel):
         self.view_kwargs = view_kwargs
 
     def content(self):
-        context = {
+        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 hasattr(self.request, 'session'):
-            context['session'] = [(k, self.request.session.get(k)) for k in self.request.session.iterkeys()]
+            context.update({
+                '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)