Refs #5138 -- Refactored implementation of __contains__ in HttpRequest introduced in [6097] after a suggestion from Malcolm. Applied a similar refactor for MergeDict and Context which had comparable behavior.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6098 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 2 insertions, 3 deletions

diff --git a/django/utils/datastructures.py b/django/utils/datastructures.py
index 4b60d1d194..d96e45b9c8 100644
--- a/django/utils/datastructures.py
+++ b/django/utils/datastructures.py
@@ -14,9 +14,6 @@ class MergeDict(object):
                 pass
         raise KeyError
 
-    def __contains__(self, key):
-        return self.has_key(key)
-
     def __copy__(self):
         return self.__class__(*self.dicts)
 
@@ -45,6 +42,8 @@ class MergeDict(object):
             if key in dict:
                 return True
         return False
+    
+    __contains__ = has_key
 
     def copy(self):
         """ returns a copy of this object"""