From b91067d9aa42e31d4375e00a703beaacdb30d608 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Wed, 20 Mar 2013 10:32:13 +0100 Subject: [1.5.x] Revert "Fixed #19895 -- Made second iteration over invalid queryset raise an exception too" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d1e87eb3baf75b1b6a0ada46a9b77f7e347cdb60. This commit was the cause of a memory leak. See ticket for more details. Thanks Anssi Kääriäinen for identifying the source of the bug. --- django/db/models/query.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'django') diff --git a/django/db/models/query.py b/django/db/models/query.py index b46528599e..952739e939 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -102,7 +102,7 @@ class QuerySet(object): len(self) if self._result_cache is None: - self._iter = self._safe_iterator(self.iterator()) + self._iter = self.iterator() self._result_cache = [] if self._iter: return self._result_iter() @@ -337,18 +337,6 @@ class QuerySet(object): yield obj - def _safe_iterator(self, iterator): - # ensure result cache is cleared when iterating over a queryset - # raises an exception - try: - for item in iterator: - yield item - except StopIteration: - raise - except Exception: - self._result_cache = None - raise - def aggregate(self, *args, **kwargs): """ Returns a dictionary containing the calculations (aggregation) -- cgit v1.3