Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #17634 -- Optimized the performance of MultiValueDict by using …

…append instead of copy and by minimizing the number of dict lookups. Refs #736.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17464 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit bd5861251490758e189d6d657de4683897024c70 1 parent f9ec6bd
@aaugustin aaugustin authored
View
21 django/utils/datastructures.py
@@ -312,9 +312,9 @@ def getlist(self, key, default=None):
try:
return super(MultiValueDict, self).__getitem__(key)
except KeyError:
- if default is not None:
- return default
- return []
+ if default is None:
+ return []
+ return default
def setlist(self, key, list_):
super(MultiValueDict, self).__setitem__(key, list_)
@@ -322,17 +322,20 @@ def setlist(self, key, list_):
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):
"""
@@ -381,15 +384,15 @@ def update(self, *args, **kwargs):
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)
def dict(self):
"""
View
6 tests/regressiontests/utils/datastructures.py
@@ -206,6 +206,12 @@ def test_multivaluedict(self):
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.copy, lambda d: d.copy()]:
d1 = MultiValueDict({
Please sign in to comment.
Something went wrong with that request. Please try again.