diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2007-02-25 16:37:31 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2007-02-25 16:37:31 +0000 |
| commit | 5b66c74b32ad973b4b715f07ce50be203401b82b (patch) | |
| tree | b1a967339d868b918256487708ddf47c9987b4b3 | |
| parent | 0a2155e5b3bf44f44b1a274a269c07af0bd58f33 (diff) | |
Fixed #2620: made MergeDict.get() correctly work with the two-argument form of get(). Thanks for the patch, SmileyChris.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4576 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/utils/datastructures.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/datastructures.py b/django/utils/datastructures.py index 9bec7a5df7..c20da05144 100644 --- a/django/utils/datastructures.py +++ b/django/utils/datastructures.py @@ -17,7 +17,7 @@ class MergeDict(object): def __contains__(self, key): return self.has_key(key) - def get(self, key, default): + def get(self, key, default=None): try: return self[key] except KeyError: |