attempt to fix MongoEngine#1086, testable with MongoEngine#1072

gordol · Apr 23, 2016 · 935e503 · 935e503
1 parent cbd2a44
commit 935e503
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
@@ -76,7 +76,8 @@ def _iter_results(self):
                 yield self._result_cache[pos]
                 pos = pos + 1
             if not self._has_more:
-                raise StopIteration
+                if pos == len(self):
+                    raise StopIteration
             if len(self._result_cache) <= pos:
                 self._populate_cache()
 
@@ -161,4 +162,4 @@ class QuerySetNoDeRef(QuerySet):
     """Special no_dereference QuerySet"""
 
     def __dereference(items, max_depth=1, instance=None, name=None):
-        return items
+        return items