From fa534b92dda0771661a98a1ca302ced264d0a6da Mon Sep 17 00:00:00 2001 From: Thomas Chaumeny Date: Thu, 9 Oct 2014 13:02:25 +0200 Subject: [PATCH] Fixed #23623 -- Reduced memory consumption when generating ModelChoiceField choices --- django/forms/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/forms/models.py b/django/forms/models.py index b23d815775..acb7f91a76 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -1083,12 +1083,12 @@ class ModelChoiceIterator(object): if self.field.cache_choices: if self.field.choice_cache is None: self.field.choice_cache = [ - self.choice(obj) for obj in self.queryset.all() + self.choice(obj) for obj in self.queryset.iterator() ] for choice in self.field.choice_cache: yield choice else: - for obj in self.queryset.all(): + for obj in self.queryset.iterator(): yield self.choice(obj) def __len__(self):