diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/models/query.py | 14 |
1 files changed, 1 insertions, 13 deletions
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) |