Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

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

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4576 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 5b66c74b32ad973b4b715f07ce50be203401b82b 1 parent 0a2155e
@jacobian jacobian authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  django/utils/datastructures.py
View
2  django/utils/datastructures.py
@@ -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):
try:
return self[key]
except KeyError:
Please sign in to comment.
Something went wrong with that request. Please try again.