[bugfix] Paginator should stop iteration when completed

b1naryth1ef · Aug 11, 2017 · 3496d6f · 3496d6f
1 parent 13f70e7
commit 3496d6f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## v0.0.12
+
+### Fixes
+
+- Fixed `Paginator` throwing an exception when reaching the end of pagination, instead of just ending its iteration
+
 ## v0.0.11
 
 ### Additions

diff --git a/disco/util/paginator.py b/disco/util/paginator.py
@@ -21,10 +21,11 @@ def fill(self):
         result = self.func(*self.args, **self.kwargs)
 
         if not len(result):
-            return
+            return 0
 
         self._buffer.extend(result)
         self._sort_key_value = self._key(result[-1])
+        return len(result)
 
     def next(self):
         return self.__next__()
@@ -34,7 +35,8 @@ def __iter__(self):
 
     def __next__(self):
         if not len(self._buffer):
-            self.fill()
+            if not self.fill():
+                raise StopIteration
 
         if self._bulk:
             res = self._buffer