Merge pull request #404 from cloudant/403-remove-unnecessary-request-in-result-iter

403 remove unnecessary request in Result iteration

Author: emlaver

CHANGES.md

@@ -3,6 +3,7 @@
 - [NEW] Add custom JSON encoder/decoder option to `Document` constructor.
 - [NEW] Add new view parameters, `stable` and `update`, as keyword arguments to `get_view_result`.
 - [FIXED] Case where an exception was raised after successful retry when using `doc.update_field`.
+- [FIXED] Removed unnecessary request when retrieving a Result collection that is less than the 'page_size' value
 
 # 2.9.0 (2018-06-13)
 

src/cloudant/result.py

@@ -341,23 +341,26 @@ def __iter__(self):
             raise ResultException(103, invalid_options, self.options)
 
         try:
-            if int(self._page_size) <= 0:
+            self._page_size = int(self._page_size)
+            if self._page_size <= 0:
                 raise ResultException(104, self._page_size)
         except ValueError:
             raise ResultException(104, self._page_size)
 
         skip = 0
         while True:
             response = self._ref(
-                limit=int(self._page_size),
+                limit=self._page_size,
                 skip=skip,
                 **self.options
             )
             result = self._parse_data(response)
-            skip += int(self._page_size)
+            skip += self._page_size
             if result:
                 for row in result:
                     yield row
+                if len(result) < self._page_size:
+                    break
                 del result
             else:
                 break