Commit 16efc1a9 authored by Joseph Kocherhans's avatar Joseph Kocherhans
Browse files

[1.1.X] Fixed #12820. Implemented other dict methods for MergeDict. Backport of [12498] from trunk. 


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12501 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent bd79677e

AUTHORS

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS -- 
people who have submitted patches, reported bugs, added translations, helped

answer newbie questions, and generally made Django that much better:



    Gisle Aas <gisle@aas.no>

    ajs <adi@sieker.info>

    alang@bright-green.com

    Marty Alchin <gulopine@gamemusic.org>

django/utils/datastructures.py

+26 −4
Original line number Diff line number Diff line
@@ -37,11 +37,32 @@ class MergeDict(object): 
                return dict_.getlist(key)

        return []



    def items(self):

        item_list = []

    def iteritems(self):

        seen = set()

        for dict_ in self.dicts:

            item_list.extend(dict_.items())

        return item_list

            for item in dict_.iteritems():

                k, v = item

                if k in seen:

                    continue

                seen.add(k)

                yield item



    def iterkeys(self):

        for k, v in self.iteritems():

            yield k



    def itervalues(self):

        for k, v in self.iteritems():

            yield v



    def items(self):

        return list(self.iteritems())



    def keys(self):

        return list(self.iterkeys())



    def values(self):

        return list(self.itervalues())



    def has_key(self, key):

        for dict_ in self.dicts:
@@ -50,6 +71,7 @@ class MergeDict(object): 
        return False



    __contains__ = has_key

    __iter__ = iterkeys



    def copy(self):

        """Returns a copy of this object."""

tests/regressiontests/datastructures/tests.py

+11 −0
Original line number Diff line number Diff line
@@ -34,6 +34,17 @@ MergeDict can merge MultiValueDicts 
>>> mm.getlist('undefined')

[]



>>> sorted(mm.keys())

['key1', 'key2', 'key4']

>>> len(mm.values())

3

>>> "value1" in mm.values()

True

>>> sorted(mm.items(), key=lambda k: k[0])

[('key1', 'value1'), ('key2', 'value3'), ('key4', 'value6')]

>>> [(k,mm.getlist(k)) for k in sorted(mm)]

[('key1', ['value1']), ('key2', ['value2', 'value3']), ('key4', ['value5', 'value6'])]



### MultiValueDict ##########################################################



>>> d = MultiValueDict({'name': ['Adrian', 'Simon'], 'position': ['Developer']})