[soc2010/query-refactor] Merged up to trunk r13556, resolved merge conflictsarchive/soc2010/query-refactorsoc2010/query-refactor

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13565 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 6 insertions, 0 deletions

diff --git a/django/test/utils.py b/django/test/utils.py
index b6ab39901b..404d130297 100644
--- a/django/test/utils.py
+++ b/django/test/utils.py
@@ -19,6 +19,12 @@ class ContextList(list):
         else:
             return super(ContextList, self).__getitem__(key)
 
+    def __contains__(self, key):
+        try:
+            value = self[key]
+        except KeyError:
+            return False
+        return True
 
 def instrumented_test_render(self, context):
     """