Browse files

Fixed #2620: made MergeDict.get() correctly work with the two-argume…

…nt form of get(). Thanks for the patch, SmileyChris.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
jacobian committed Feb 25, 2007
1 parent 0a2155e commit 5b66c74b32ad973b4b715f07ce50be203401b82b
Showing with 1 addition and 1 deletion.
  1. +1 −1 django/utils/
@@ -17,7 +17,7 @@ def __getitem__(self, key):
def __contains__(self, key):
return self.has_key(key)
- def get(self, key, default):
+ def get(self, key, default=None):
return self[key]
except KeyError:

0 comments on commit 5b66c74

Please sign in to comment.