Ticket #20287: 20287.patch

django/template/context.py

@@ -30 +30 @@
     def __repr__(self):
         return repr(self.dicts)
 
-    def __iter__(self):
+    def iteritems(self):
+        # Track the keys yielded so we don't send items more than once.
+        yielded_keys = set() 
         for d in reversed(self.dicts):
-            yield d
+            for k in d:
+                if k not in yielded_keys:
+                    yielded_keys.add(k)
+                    yield (k, d[k])
+
+    def iterkeys(self):
+        return (item[0] for item in self.iteritems())
+
+    __iter__ = iterkeys
+
+    def itervalues(self):
+        return (item[1] for item in self.iteritems())
+
+    def keys(self):
+        return list(self.iterkeys())
+
+    def items(self):
+        return list(self.iteritems())
+
+    def values(self):
+        return list(self.itervalues())
+
+    def __len__(self):
+        return len(set().union(*self.dicts))
 
     def push(self):
         d = {}
@@ -65 +90 @@
                 return True
         return False
 
-    def __contains__(self, key):
-        return self.has_key(key)
+    __contains__ = has_key
 
     def get(self, key, otherwise=None):
         for d in reversed(self.dicts):
@@ -122 +146 @@
     template context.
     """
     def __iter__(self):
-        for d in self.dicts[-1]:
-            yield d
+        return self.dicts[-1].__iter__()
 
     def has_key(self, key):
-        return key in self.dicts[-1]
+        return self.dicts[-1].has_key(key)
 
     def get(self, key, otherwise=None):
-        d = self.dicts[-1]
-        if key in d:
-            return d[key]
-        return otherwise
+        return self.dicts[-1].get(key, otherwise)
+
+    def keys(self):
+        return self.dicts[-1].keys()
+
+    def items(self):
+        return self.dicts[-1].items()
+
+    def values(self):
+        return self.dicts[-1].values()
+
+    def iterkeys(self):
+        return self.dicts[-1].iterkeys()
+
+    def iteritems(self):
+        return self.dicts[-1].iteritems()
+
+    def itervalues(self):
+        return self.dicts[-1].itervalues()
+
+    def __len__(self):
+        return len(self.dicts[-1])
 
 # This is a function rather than module-level procedural code because we only
 # want it to execute if somebody uses RequestContext.