From 1d8db5ad89740e7e1783c964cf74148db1ac5876 Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Thu, 31 Aug 2006 21:51:19 +0000
Subject: [PATCH] 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
---
 AUTHORS                        |  1 +
 django/utils/datastructures.py | 28 +++++++++++++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index e52fb46b474..9c7463551ab 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -126,6 +126,7 @@ answer newbie questions, and generally made Django that much better:
     Oliver Rutherfurd <http://rutherfurd.net/>
     Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
     David Schein
+    Pete Shinners <pete@shinners.org>
     sopel
     Thomas Steinacher <tom@eggdrop.ch>
     Radek Švarz <http://www.svarz.cz/translate/>
diff --git a/django/utils/datastructures.py b/django/utils/datastructures.py
index 632e804f267..6aef313d351 100644
--- a/django/utils/datastructures.py
+++ b/django/utils/datastructures.py
@@ -187,17 +187,23 @@ class MultiValueDict(dict):
         "Returns a copy of this object."
         return self.__deepcopy__()
 
-    def update(self, other_dict):
-        "update() extends rather than replaces existing key lists."
-        if isinstance(other_dict, MultiValueDict):
-            for key, value_list in other_dict.lists():
-                self.setlistdefault(key, []).extend(value_list)
-        else:
-            try:
-                for key, value in other_dict.items():
-                    self.setlistdefault(key, []).append(value)
-            except TypeError:
-                raise ValueError, "MultiValueDict.update() takes either a MultiValueDict or dictionary"
+    def update(self, *args, **kwargs):
+        "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):
+                for key, value_list in other_dict.lists():
+                    self.setlistdefault(key, []).extend(value_list)
+            else:
+                try:
+                    for key, value in other_dict.items():
+                        self.setlistdefault(key, []).append(value)
+                except TypeError:
+                    raise ValueError, "MultiValueDict.update() takes either a MultiValueDict or dictionary"
+        for key, value in kwargs.iteritems():
+            self.setlistdefault(key, []).append(value)
 
 class DotExpandedDict(dict):
     """