Fix a few bugs with the new ID cursors.

joshthecoder · joshthecoder · commit 40adbd9d5ca3 · 2013-06-09T22:35:06.000-07:00
- stop once end of collection reached (empty result).
 - don't raise ValueError if ResultSet is empty when
   trying to get max/min ID of the set (max() and min() don't
   accept empty lists)
diff --git a/tweepy/cursor.py b/tweepy/cursor.py
@@ -91,6 +91,8 @@ def next(self):
         # to avoid requesting duplicate items.
         max_id = self.since_id - 1 if self.max_id else None
         data = self.method(max_id = max_id, *self.args, **self.kargs)
+        if len(data) == 0:
+            raise StopIteration
         self.max_id = data.max_id
         self.since_id = data.since_id
         return data
@@ -99,6 +101,8 @@ def prev(self):
         """Fetch a set of items with IDs greater than current set."""
         since_id = self.max_id
         data = self.method(since_id = since_id, *self.args, **self.kargs)
+        if len(data) == 0:
+            raise StopIteration
         self.max_id = data.max_id
         self.since_id = data.since_id
         return data
diff --git a/tweepy/models.py b/tweepy/models.py
@@ -16,11 +16,17 @@ def __init__(self, max_id=None, since_id=None):
 
     @property
     def max_id(self):
-        return self._max_id or max(self.ids())
+        if self._max_id:
+            return self._max_id
+        ids = self.ids()
+        return max(ids) if ids else None
 
     @property
     def since_id(self):
-        return self._since_id or min(self.ids())
+        if self._since_id:
+            return self._since_id
+        ids = self.ids()
+        return min(ids) if ids else None
 
     def ids(self):
         return [item.id for item in self if hasattr(item, 'id')]
