Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
Jacob Kaplan-Moss authored February 25, 2007

Showing 1 changed file with 1 addition and 1 deletion. Show diff stats Hide diff stats

  1. 2  django/utils/datastructures.py
2  django/utils/datastructures.py
@@ -17,7 +17,7 @@ def __getitem__(self, key):
17 17
     def __contains__(self, key):
18 18
         return self.has_key(key)
19 19
 
20  
-    def get(self, key, default):
  20
+    def get(self, key, default=None):
21 21
         try:
22 22
             return self[key]
23 23
         except KeyError:

0 notes on commit 5b66c74

Please sign in to comment.
Something went wrong with that request. Please try again.