Commit 2b82a3bc authored by Gary Wilson Jr's avatar Gary Wilson Jr
Browse files

Fixed #7331 -- Made `QueryDict.iteritems` behave like `QueryDict.items`, thanks jurev. 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent ddc156bc

django/utils/datastructures.py

+8 −0
Original line number Diff line number Diff line
@@ -266,6 +266,14 @@ class MultiValueDict(dict): 
        """

        return [(key, self[key]) for key in self.keys()]



    def iteritems(self):

        """

        Yields (key, value) pairs, where value is the last item in the list

        associated with the key.

        """

        for key in self.keys():

            yield (key, self[key])



    def lists(self):

        """Returns a list of (key, list) pairs."""

        return super(MultiValueDict, self).items()

tests/regressiontests/datastructures/tests.py

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ MergeDict can merge MultiValueDicts 
'Simon'

>>> d.getlist('name')

['Adrian', 'Simon']

>>> list(d.iteritems())

[('position', 'Developer'), ('name', 'Simon')]

>>> d['lastname']

Traceback (most recent call last):

...