rebase off master

jeremylow · jeremylow · commit c6d31ff4399f · 2016-05-07T08:53:05.000-04:00
diff --git a/doc/migration_v30.rst b/doc/migration_v30.rst
@@ -4,6 +4,11 @@ Migration from v2 to v3
 Changes to Existing Methods
 ===========================
 
+:py:func:`twitter.api.Api()`
+++++++++++++++++++++++++++++
+* ``shortner`` parameter has been removed. Please see `Issue
+  #298 <https://github.com/bear/python-twitter/issues/298>`_.
+
 :py:func:`twitter.api.Api.CreateFavorite`
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 * kwarg param has been changed to ``status_id`` from ``id`` to be consistent
diff --git a/twitter/api.py b/twitter/api.py
@@ -132,7 +132,6 @@ def __init__(self,
                  input_encoding=None,
                  request_headers=None,
                  cache=DEFAULT_CACHE,
-                 shortner=None,
                  base_url=None,
                  stream_url=None,
                  upload_url=None,
@@ -161,9 +160,6 @@ def __init__(self,
           cache:
             The cache instance to use. Defaults to DEFAULT_CACHE.
             Use None to disable caching. [Optional]
-          shortner:
-            The shortner instance to use.  Defaults to None.
-            See shorten_url.py for an example shortner. [Optional]
           base_url:
             The base URL to use to contact the Twitter API.
             Defaults to https://api.twitter.com. [Optional]
@@ -1561,7 +1557,6 @@ def GetRetweeters(self,
                     parameters['count'] = int(cursor)
                 except ValueError:
                     raise TwitterError({'message': "cursor must be an integer"})
-                    break
             resp = self._RequestUrl(url, 'GET', data=parameters)
             data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
             result += [x for x in data['ids']]
