From 3496d6f3b92b9558621b12f956249562709f2a8b Mon Sep 17 00:00:00 2001
From: Andrei <b1naryth1ef@gmail.com>
Date: Thu, 10 Aug 2017 19:34:58 -0700
Subject: [PATCH] [bugfix] Paginator should stop iteration when completed

---
 CHANGELOG.md            | 6 ++++++
 disco/util/paginator.py | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63a37c5..3e10fbb 100644
--- 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
index 7e4b732..4f705e9 100644
--- a/disco/util/paginator.py
+++ b/disco/util/paginator.py
@@ -21,10 +21,11 @@ class Paginator(object):
         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 @@ class Paginator(object):
 
     def __next__(self):
         if not len(self._buffer):
-            self.fill()
+            if not self.fill():
+                raise StopIteration
 
         if self._bulk:
             res = self._buffer