Ticket #7475: models.py.diff

django/newforms/models.py

@@ -285 +285 @@
     def __iter__(self):
         if self.field.empty_label is not None:
             yield (u"", self.field.empty_label)
-        for obj in self.queryset:
+        # TODO: Support self.field.cache_choices but beware of threading issues
+        for obj in self.queryset.all():
             yield (obj.pk, self.field.label_from_instance(obj))
-        # Clear the QuerySet cache if required.
-        if not self.field.cache_choices:
-            self.queryset._result_cache = None
 
 class ModelChoiceField(ChoiceField):
     """A ChoiceField whose choices are a model QuerySet."""