From 23490a2394bf03e119e4c9a7a09a9ba35edad430 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Wed, 20 Mar 2013 10:41:53 +0100 Subject: [PATCH] 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 2cd0edaa477b327024e4007c8eaf46646dcd0f21. 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 +------------- tests/basic/tests.py | 7 +------ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/django/db/models/query.py b/django/db/models/query.py index 22c7cfba323..7ddd933772d 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -104,7 +104,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() @@ -341,18 +341,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) diff --git a/tests/basic/tests.py b/tests/basic/tests.py index a8005baca7b..ccbb9bd4236 100644 --- a/tests/basic/tests.py +++ b/tests/basic/tests.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from datetime import datetime import threading -from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned, FieldError +from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned from django.db import connections, DEFAULT_DB_ALIAS from django.db.models.fields import Field, FieldDoesNotExist from django.db.models.query import QuerySet, EmptyQuerySet, ValuesListQuerySet @@ -689,11 +689,6 @@ class ModelTest(TestCase): with self.assertNumQueries(0): self.assertEqual(len(Article.objects.none().distinct('headline', 'pub_date')), 0) - def test_invalid_qs_list(self): - qs = Article.objects.order_by('invalid_column') - self.assertRaises(FieldError, list, qs) - self.assertRaises(FieldError, list, qs) - class ConcurrentSaveTests(TransactionTestCase): @skipUnlessDBFeature('test_db_allows_multiple_connections') def test_concurrent_delete_with_save(self):