From: Harmon <Harmon758@gmail.com>
Date: Thu, 29 Apr 2021 09:19:45 +0000 (-0500)
Subject: Use default limit of infinite rather than 0 for Cursor and iterators
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f5f98d63de447cf4518ae22beb9a21fe3dcd6cc0;p=tweepy.git

Use default limit of infinite rather than 0 for Cursor and iterators
---

diff --git a/tweepy/cursor.py b/tweepy/cursor.py
index 78c00b3..aabd948 100644
--- a/tweepy/cursor.py
+++ b/tweepy/cursor.py
@@ -2,6 +2,8 @@
 # Copyright 2009-2021 Joshua Roesslein
 # See LICENSE for details.
 
+from math import inf
+
 from tweepy.errors import TweepyException
 from tweepy.parsers import ModelParser, RawParser
 
@@ -37,7 +39,7 @@ class Cursor:
         else:
             raise TweepyException('This method does not perform pagination')
 
-    def pages(self, limit=0):
+    def pages(self, limit=inf):
         """Retrieve the page for each request
 
         Parameters
@@ -51,11 +53,10 @@ class Cursor:
         PageIterator
             Iterator to iterate through pages
         """
-        if limit > 0:
-            self.iterator.limit = limit
+        self.iterator.limit = limit
         return self.iterator
 
-    def items(self, limit=0):
+    def items(self, limit=inf):
         """Retrieve the items in each page/request
 
         Parameters
@@ -79,7 +80,7 @@ class BaseIterator:
         self.method = method
         self.args = args
         self.kwargs = kwargs
-        self.limit = 0
+        self.limit = inf
 
     def __next__(self):
         return self.next()
@@ -104,7 +105,7 @@ class CursorIterator(BaseIterator):
         self.num_tweets = 0
 
     def next(self):
-        if self.next_cursor == 0 or (self.limit and self.num_tweets == self.limit):
+        if self.next_cursor == 0 or self.num_tweets == self.limit:
             raise StopIteration
         data, cursors = self.method(cursor=self.next_cursor,
                                     *self.args,
@@ -133,7 +134,7 @@ class DMCursorIterator(BaseIterator):
         self.page_count = 0
 
     def next(self):
-        if self.next_cursor == -1 or (self.limit and self.page_count == self.limit):
+        if self.next_cursor == -1 or self.page_count == self.limit:
             raise StopIteration
         data = self.method(cursor=self.next_cursor, return_cursors=True, *self.args, **self.kwargs)
         self.page_count += 1
@@ -159,7 +160,7 @@ class IdIterator(BaseIterator):
 
     def next(self):
         """Fetch a set of items with IDs less than current set."""
-        if self.limit and self.limit == self.num_tweets:
+        if self.limit == self.num_tweets:
             raise StopIteration
 
         if self.index >= len(self.results) - 1:
@@ -195,7 +196,7 @@ class IdIterator(BaseIterator):
 
     def prev(self):
         """Fetch a set of items with IDs greater than current set."""
-        if self.limit and self.limit == self.num_tweets:
+        if self.limit == self.num_tweets:
             raise StopIteration
 
         self.index -= 1
@@ -223,9 +224,8 @@ class PageIterator(BaseIterator):
         self.previous_items = []
 
     def next(self):
-        if self.limit > 0:
-            if self.current_page > self.limit:
-                raise StopIteration
+        if self.current_page > self.limit:
+            raise StopIteration
 
         items = self.method(page=self.current_page, *self.args, **self.kwargs)
 
@@ -255,7 +255,7 @@ class NextIterator(BaseIterator):
         self.page_count = 0
 
     def next(self):
-        if self.next_token == -1 or (self.limit and self.page_count == self.limit):
+        if self.next_token == -1 or self.page_count == self.limit:
             raise StopIteration
         data = self.method(next=self.next_token, return_cursors=True, *self.args, **self.kwargs)
         self.page_count += 1
@@ -273,15 +273,14 @@ class ItemIterator(BaseIterator):
 
     def __init__(self, page_iterator):
         self.page_iterator = page_iterator
-        self.limit = 0
+        self.limit = inf
         self.current_page = None
         self.page_index = -1
         self.num_tweets = 0
 
     def next(self):
-        if self.limit > 0:
-            if self.num_tweets == self.limit:
-                raise StopIteration
+        if self.num_tweets == self.limit:
+            raise StopIteration
         if self.current_page is None or self.page_index == len(self.current_page) - 1:
             # Reached end of current page, get the next page...
             self.current_page = next(self.page_iterator)