summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/datastructures.py5
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"""