Refs #910 - Thinking further on it. Using id() on the Context is probably not the wisest, as it is likely to mutate with pushes & pops during the course of renderings, which may add or remove keys which wouldn't be reflected in this re-use.

Doing the id() on the individual layers would work better, in this case, because pushes and pops don't mutate the underlying dict, just add new/remove existing ones.

Author: kezabelle

debug_toolbar/panels/templates/panel.py

@@ -87,12 +87,12 @@ def _store_template_info(self, sender, **kwargs):
         # Refs #910
         # The same Context instance may be passed around a lot, so if we've
         # seen it before, just re-use the previous output.
-        context_id = id(context)
-        if context_id in self.seen_contexts:
-            context_list = self.seen_contexts[context_id]
-        else:
-            context_list = []
-            for context_layer in context.dicts:
+        context_list = []
+        for context_layer in context.dicts:
+            context_layer_id = id(context_layer)
+            if context_layer_id in self.seen_contexts:
+                context_list.append(self.seen_contexts[context_layer_id])
+            else:
                 temp_layer = {}
                 if hasattr(context_layer, 'items'):
                     for key, value in context_layer.items():
@@ -134,15 +134,7 @@ def _store_template_info(self, sender, **kwargs):
                     pass
                 else:
                     context_list.append(prettified_layer)
-            # Refs GitHub issue #910
-            # After Django introduced template based form widget rendering,
-            # djdt has to collect and format far more contexts, many of which
-            # are duplicates, and don't need formatting if we've already seen
-            # the exact same context.
-            # At this point, we know this is the first time we've seen and
-            # collected the layers of this context, so we store the value into
-            # a dictionary whose key is the id() of the Context instance.
-            self.seen_contexts[context_id] = context_list
+                    self.seen_contexts[context_layer_id]= prettified_layer
 
         kwargs['context'] = context_list
         kwargs['context_processors'] = getattr(context, 'context_processors', None)