Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.5.x] Revert "Fixed #19895 -- Made second iteration over invalid qu…

…eryset raise an exception too"

This reverts commit d1e87eb.
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.
  • Loading branch information...
commit b91067d9aa42e31d4375e00a703beaacdb30d608 1 parent 5c78877
@claudep claudep authored
Showing with 2 additions and 19 deletions.
  1. +1 −13 django/db/models/query.py
  2. +1 −6 tests/modeltests/basic/tests.py
View
14 django/db/models/query.py
@@ -102,7 +102,7 @@ def __iter__(self):
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 @@ def iterator(self):
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)
View
7 tests/modeltests/basic/tests.py
@@ -2,7 +2,7 @@
from datetime import datetime
-from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned, FieldError
+from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
from django.db.models.fields import Field, FieldDoesNotExist
from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature
from django.utils import six
@@ -639,8 +639,3 @@ def test_create_relation_with_ugettext_lazy(self):
Article.objects.bulk_create([Article(headline=lazy, pub_date=datetime.now())])
article = Article.objects.get()
self.assertEqual(article.headline, notlazy)
-
- def test_invalid_qs_list(self):
- qs = Article.objects.order_by('invalid_column')
- self.assertRaises(FieldError, list, qs)
- self.assertRaises(FieldError, list, qs)
Please sign in to comment.
Something went wrong with that request. Please try again.