From 0bbe7379ee3e2cb290f9c9e841bb2f1457e14b16 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sun, 25 Mar 2012 06:53:47 +0000
Subject: [PATCH] [1.3.X] Fixed #17634 -- Optimized the performance of
 MultiValueDict by using append instead of copy and by minimizing the number
 of dict lookups. Backport of r17464 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@17807 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/utils/datastructures.py                | 15 +++++++++------
 tests/regressiontests/utils/datastructures.py |  6 ++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/django/utils/datastructures.py b/django/utils/datastructures.py
index 7425ea2ce2..33cc2450c2 100644
--- a/django/utils/datastructures.py
+++ b/django/utils/datastructures.py
@@ -319,17 +319,20 @@ class MultiValueDict(dict):
     def setdefault(self, key, default=None):
         if key not in self:
             self[key] = default
+            return default
         return self[key]
 
-    def setlistdefault(self, key, default_list=()):
+    def setlistdefault(self, key, default_list=None):
         if key not in self:
+            if default_list is None:
+                default_list = []
             self.setlist(key, default_list)
+            return default_list
         return self.getlist(key)
 
     def appendlist(self, key, value):
         """Appends an item to the internal list associated with key."""
-        self.setlistdefault(key, [])
-        super(MultiValueDict, self).__setitem__(key, self.getlist(key) + [value])
+        self.setlistdefault(key).append(value)
 
     def items(self):
         """
@@ -378,15 +381,15 @@ class MultiValueDict(dict):
             other_dict = args[0]
             if isinstance(other_dict, MultiValueDict):
                 for key, value_list in other_dict.lists():
-                    self.setlistdefault(key, []).extend(value_list)
+                    self.setlistdefault(key).extend(value_list)
             else:
                 try:
                     for key, value in other_dict.items():
-                        self.setlistdefault(key, []).append(value)
+                        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)
+            self.setlistdefault(key).append(value)
 
 class DotExpandedDict(dict):
     """
diff --git a/tests/regressiontests/utils/datastructures.py b/tests/regressiontests/utils/datastructures.py
index 3d01ab8b6f..1f8b59ec17 100644
--- a/tests/regressiontests/utils/datastructures.py
+++ b/tests/regressiontests/utils/datastructures.py
@@ -212,6 +212,12 @@ class MultiValueDictTests(DatastructuresTestCase):
         self.assertEqual(list(d.itervalues()),
                           ['Developer', 'Simon', 'Willison'])
 
+    def test_appendlist(self):
+        d = MultiValueDict()
+        d.appendlist('name', 'Adrian')
+        d.appendlist('name', 'Simon')
+        self.assertEqual(d.getlist('name'), ['Adrian', 'Simon'])
+
     def test_copy(self):
         for copy_func in [copy, lambda d: d.copy()]:
             d1 = MultiValueDict({