Ticket #3529: context_update.2.patch

django/template/context.py

@@ -58 +58 @@
                 return d[key]
         return otherwise
 
-    def update(self, other_dict):
-        "Like dict.update(). Pushes an entire dictionary's keys and values onto the context."
-        self.dicts = [other_dict] + self.dicts
+    def update(self, other_dict, push=True):
+        """
+        Similar to dict.update(). Updates the current context's keys and values
+        from other_dict.
+        
+        If push is True, it will push the other_dict dictionary on to the
+        context, otherwise the most recent context dictionary will be updated.
+        """
+        if push:
+            self.dicts = [other_dict] + self.dicts
+        else:
+            self.dicts[0].update(other_dict)
 
 # This is a function rather than module-level procedural code because we only
 # want it to execute if somebody uses RequestContext.