Commit e8b001f4 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.1.X] Fixed #12476 -- Forced the rollout of generators passed to SortedDict... 

[1.1.X] Fixed #12476 -- Forced the rollout of generators passed to SortedDict so that the data source can be read twice. Thanks to gsf for the report, and Alex for the patch.

Backport of r12064 from trunk.

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

django/utils/datastructures.py

+7 −0
Original line number Diff line number Diff line 
from types import GeneratorType



from django.utils.copycompat import deepcopy
@@ -65,6 +67,11 @@ class SortedDict(dict): 
    def __init__(self, data=None):

        if data is None:

            data = {}

        elif isinstance(data, GeneratorType):

            # Unfortunately we need to be able to read a generator twice.  Once

            # to get the data into self with our super().__init__ call and a

            # second time to setup keyOrder correctly

            data = list(data)

        super(SortedDict, self).__init__(data)

        if isinstance(data, dict):

            self.keyOrder = data.keys()

tests/regressiontests/datastructures/tests.py

+5 −2
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ True 
>>> d.pop('one', 'missing')

'missing'



>>> SortedDict((i, i) for i in xrange(3))

{0: 0, 1: 1, 2: 2}



We don't know which item will be popped in popitem(), so we'll just check that

the number of keys has decreased.

>>> l = len(d)