From 5b66c74b32ad973b4b715f07ce50be203401b82b Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Sun, 25 Feb 2007 16:37:31 +0000 Subject: [PATCH] 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 --- django/utils/datastructures.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: