From faeebad921d712b01d58d44c17bf7e46ff604bd2 Mon Sep 17 00:00:00 2001
From: s0ckz <s0ckzz@gmail.com>
Date: Mon, 2 Jun 2014 13:02:40 -0300
Subject: [PATCH 1/2] Some corrections for twython cursor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It’s now working properly for search and get_user_timeline. I didn’t
test other functions though.
---
 twython/api.py | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/twython/api.py b/twython/api.py
index 1d23a35..91682e8 100644
--- a/twython/api.py
+++ b/twython/api.py
@@ -430,19 +430,15 @@ class Twython(EndpointsMixin, object):
             if function.iter_mode == 'cursor' and content['next_cursor_str'] == '0':
                 raise StopIteration
 
-            try:
-                if function.iter_mode == 'id':
-                    if not 'max_id' in params:
-                        # Add 1 to the id because since_id and max_id are inclusive
-                        if hasattr(function, 'iter_metadata'):
-                            since_id = content[function.iter_metadata].get('since_id_str')
-                        else:
-                            since_id = content[0]['id_str']
-                        params['since_id'] = (int(since_id) - 1)
-                elif function.iter_mode == 'cursor':
-                    params['cursor'] = content['next_cursor_str']
-            except (TypeError, ValueError):  # pragma: no cover
-                raise TwythonError('Unable to generate next page of search results, `page` is not a number.')
+            if function.iter_mode == 'id':
+                if hasattr(function, 'iter_key') and len(content[function.iter_key]) > 0:
+                    params['max_id'] = min(content[function.iter_key], key=lambda i: i['id'])['id'] - 1
+                elif not hasattr(function, 'iter_key') and len(content) > 0:
+                    params['max_id'] = min(content, key=lambda i: i['id'])['id'] - 1
+                else:
+                    raise StopIteration
+            elif function.iter_mode == 'cursor':
+                params['cursor'] = content['next_cursor_str']
 
     @staticmethod
     def unicode2utf8(text):

From 5d22570f9825f3b91c1f691a47c71c2ee1784507 Mon Sep 17 00:00:00 2001
From: s0ckz <s0ckzz@gmail.com>
Date: Mon, 2 Jun 2014 19:32:40 -0300
Subject: [PATCH 2/2] Sleep property to avoid problems with twitter

---
 twython/api.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/twython/api.py b/twython/api.py
index 91682e8..0e10874 100644
--- a/twython/api.py
+++ b/twython/api.py
@@ -12,6 +12,7 @@ dealing with the Twitter API
 import requests
 from requests.auth import HTTPBasicAuth
 from requests_oauthlib import OAuth1, OAuth2
+import time
 
 from . import __version__
 from .advisory import TwythonDeprecationWarning
@@ -28,7 +29,8 @@ warnings.simplefilter('always', TwythonDeprecationWarning)  # For Python 2.7 >
 class Twython(EndpointsMixin, object):
     def __init__(self, app_key=None, app_secret=None, oauth_token=None,
                  oauth_token_secret=None, access_token=None, token_type='bearer',
-                 oauth_version=1, api_version='1.1', client_args=None, auth_endpoint='authenticate'):
+                 oauth_version=1, api_version='1.1', client_args=None, auth_endpoint='authenticate',
+                 sleep_on_cursor=0):
         """Instantiates an instance of Twython. Takes optional parameters for authentication and such (see below).
 
         :param app_key: (optional) Your applications key
@@ -58,6 +60,7 @@ class Twython(EndpointsMixin, object):
         self.oauth_token = oauth_token
         self.oauth_token_secret = oauth_token_secret
         self.access_token = access_token
+        self.sleep_on_cursor = sleep_on_cursor
 
         # OAuth 1
         self.request_token_url = self.api_url % 'oauth/request_token'
@@ -440,6 +443,8 @@ class Twython(EndpointsMixin, object):
             elif function.iter_mode == 'cursor':
                 params['cursor'] = content['next_cursor_str']
 
+            time.sleep(self.sleep_on_cursor)
+
     @staticmethod
     def unicode2utf8(text):
         try: