diff options
| author | Jason Pellerin <jpellerin@gmail.com> | 2006-11-29 20:02:43 +0000 |
|---|---|---|
| committer | Jason Pellerin <jpellerin@gmail.com> | 2006-11-29 20:02:43 +0000 |
| commit | 71012a4be3830b1040815243ebb7c0d48dbd8e57 (patch) | |
| tree | e66d2227298cc0bccc4ef874d023a4ef29c60c52 /django/utils/datastructures.py | |
| parent | f6d48b5d02acc7cd8d71ffe895fbf41c7c9ae2b7 (diff) | |
[multi-db] Merge trunk to [3812]. Some tests still failing.
git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@4139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils/datastructures.py')
| -rw-r--r-- | django/utils/datastructures.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/django/utils/datastructures.py b/django/utils/datastructures.py index 6aef313d35..cecb4da170 100644 --- a/django/utils/datastructures.py +++ b/django/utils/datastructures.py @@ -14,6 +14,9 @@ class MergeDict(object): pass raise KeyError + def __contains__(self, key): + return self.has_key(key) + def get(self, key, default): try: return self[key] |