Ticket #3436: 3436.diff

django/db/models/fields/__init__.py

@@ -287 +287 @@
 
     def get_choices(self, include_blank=True, blank_choice=BLANK_CHOICE_DASH):
         "Returns a list of tuples used as SelectField choices for this field."
-        first_choice = include_blank and blank_choice or []
+        if include_blank:
+            yield blank_choice[0]
         if self.choices:
-            return first_choice + list(self.choices)
+            for choice in self.choices:
+                yield choice
+            return
         rel_model = self.rel.to
-        if hasattr(self.rel, 'get_related_field'):
-            lst = [(getattr(x, self.rel.get_related_field().attname), str(x)) for x in rel_model._default_manager.complex_filter(self.rel.limit_choices_to)]
-        else:
-            lst = [(x._get_pk_val(), str(x)) for x in rel_model._default_manager.complex_filter(self.rel.limit_choices_to)]
-        return first_choice + lst
+        for x in rel_model._default_manager.complex_filter(self.rel.limit_choices_to):
+            if hasattr(self.rel, 'get_related_field'):
+                yield (getattr(x, self.rel.get_related_field().attname), str(x))
+            else:
+                yield (x._get_pk_val(), str(x))
 
     def get_choices_default(self):
         if self.radio_admin: