Fixed #2441 -- Improved MultiValueDict.update() to take keyword args, like Python 2.4 built-in dict. Thanks for the patch, Pete Shinners

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-08-31 21:51:19 +00:00
parent 93b1f9ad6e
commit 1d8db5ad89
2 changed files with 18 additions and 11 deletions

View File

@ -126,6 +126,7 @@ answer newbie questions, and generally made Django that much better:
Oliver Rutherfurd <http://rutherfurd.net/> Oliver Rutherfurd <http://rutherfurd.net/>
Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/> Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
David Schein David Schein
Pete Shinners <pete@shinners.org>
sopel sopel
Thomas Steinacher <tom@eggdrop.ch> Thomas Steinacher <tom@eggdrop.ch>
Radek Švarz <http://www.svarz.cz/translate/> Radek Švarz <http://www.svarz.cz/translate/>

View File

@ -187,8 +187,12 @@ class MultiValueDict(dict):
"Returns a copy of this object." "Returns a copy of this object."
return self.__deepcopy__() return self.__deepcopy__()
def update(self, other_dict): def update(self, *args, **kwargs):
"update() extends rather than replaces existing key lists." "update() extends rather than replaces existing key lists. Also accepts keyword args."
if len(args) > 1:
raise TypeError, "update expected at most 1 arguments, got %d", len(args)
if args:
other_dict = args[0]
if isinstance(other_dict, MultiValueDict): if isinstance(other_dict, MultiValueDict):
for key, value_list in other_dict.lists(): for key, value_list in other_dict.lists():
self.setlistdefault(key, []).extend(value_list) self.setlistdefault(key, []).extend(value_list)
@ -198,6 +202,8 @@ class MultiValueDict(dict):
self.setlistdefault(key, []).append(value) self.setlistdefault(key, []).append(value)
except TypeError: except TypeError:
raise ValueError, "MultiValueDict.update() takes either a MultiValueDict or dictionary" raise ValueError, "MultiValueDict.update() takes either a MultiValueDict or dictionary"
for key, value in kwargs.iteritems():
self.setlistdefault(key, []).append(value)
class DotExpandedDict(dict): class DotExpandedDict(dict):
""" """