Ticket #12476: diff2.diff

django/utils/datastructures.py

@@ +1 @@
+from types import GeneratorType
+
 from django.utils.copycompat import deepcopy
 
 
@@ -65 +67 @@
     def __init__(self, data=None):
         if data is None:
             data = {}
+        elif isinstance(data, GeneratorType):
+            data = list(data)  # Convert to list to read data twice.  
         super(SortedDict, self).__init__(data)
         if isinstance(data, dict):
             self.keyOrder = data.keys()

tests/regressiontests/datastructures/tests.py

@@ -119 +119 @@
 >>> d.keyOrder
 []
 
+Init from generator
+>>> d = SortedDict((i, i) for i in xrange(3))
+>>> print repr(d)
+{0: 0, 1: 1, 2: 2}
+
 ### DotExpandedDict ##########################################################
 
 >>> d = DotExpandedDict({'person.1.firstname': ['Simon'], 'person.1.lastname': ['Willison'], 'person.2.firstname': ['Adrian'], 'person.2.lastname': ['Holovaty']})