Fixed #12375 -- Added a dict() method to convert a MultiValueDict (such as a QueryDict) to a dictionary of key-value pairs. Thanks, oinopion and hvdklauw.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16418 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2011-06-16 16:34:55 +00:00
parent dfa29161e2
commit 97f22f2969
3 changed files with 30 additions and 0 deletions

View File

@ -391,6 +391,12 @@ class MultiValueDict(dict):
for key, value in kwargs.iteritems(): for key, value in kwargs.iteritems():
self.setlistdefault(key, []).append(value) self.setlistdefault(key, []).append(value)
def dict(self):
"""
Returns current object as a dict with singular values.
"""
return dict((key, self[key]) for key in self)
class DotExpandedDict(dict): class DotExpandedDict(dict):
""" """
A special dictionary constructor that takes a dictionary in which the keys A special dictionary constructor that takes a dictionary in which the keys

View File

@ -482,6 +482,18 @@ In addition, ``QueryDict`` has the following methods:
>>> q.lists() >>> q.lists()
[(u'a', [u'1', u'2', u'3'])] [(u'a', [u'1', u'2', u'3'])]
.. method:: QueryDict.dict()
.. versionadded:: 1.4
Returns ``dict`` representation of ``QueryDict``. For every (key, list)
pair in ``QueryDict``, ``dict`` will have (key, item), where item is one
element of the list, using same logic as :meth:`QueryDict.__getitem__()`::
>>> q = QueryDict('a=1&a=3&a=5')
>>> q.dict()
{u'a': u'5'}
.. method:: QueryDict.urlencode([safe]) .. method:: QueryDict.urlencode([safe])
Returns a string of the data in query-string format. Example:: Returns a string of the data in query-string format. Example::

View File

@ -235,6 +235,18 @@ class MultiValueDictTests(DatastructuresTestCase):
self.assertEqual(d1["key"], ["Penguin"]) self.assertEqual(d1["key"], ["Penguin"])
self.assertEqual(d2["key"], ["Penguin"]) self.assertEqual(d2["key"], ["Penguin"])
def test_dict_translation(self):
mvd = MultiValueDict({
'devs': ['Bob', 'Joe'],
'pm': ['Rory'],
})
d = mvd.dict()
self.assertEqual(d.keys(), mvd.keys())
for key in mvd.keys():
self.assertEqual(d[key], mvd[key])
self.assertEqual({}, MultiValueDict().dict())
class DotExpandedDictTests(DatastructuresTestCase): class DotExpandedDictTests(DatastructuresTestCase):