diff --git a/setup.py b/setup.py index c9177e3..5839e46 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup from setuptools import find_packages __author__ = 'Ryan McGrath ' -__version__ = '2.5.0' +__version__ = '2.5.1' setup( # Basic package information. diff --git a/twython/twython.py b/twython/twython.py index 0417b2b..5bf25fb 100644 --- a/twython/twython.py +++ b/twython/twython.py @@ -227,7 +227,7 @@ class Twython(object): we haven't gotten around to putting it in Twython yet. :) ''' - def request(self, endpoint, method='GET', params=None, files=None, version=1): + def request(self, endpoint, method='GET', params=None, files=None, version='1.1'): # In case they want to pass a full Twitter URL # i.e. https://search.twitter.com/ if endpoint.startswith('http://') or endpoint.startswith('https://'): @@ -239,10 +239,10 @@ class Twython(object): return content - def get(self, endpoint, params=None, version=1): + def get(self, endpoint, params=None, version='1.1'): return self.request(endpoint, params=params, version=version) - def post(self, endpoint, params=None, files=None, version=1): + def post(self, endpoint, params=None, files=None, version='1.1'): return self.request(endpoint, 'POST', params=params, files=files, version=version) # End Dynamic Request Methods @@ -369,7 +369,7 @@ class Twython(object): e.g x.search(q='jjndf', page='2') """ - return self.get('https://search.twitter.com/search.json', params=kwargs) + return self.get('https://api.twitter.com/1.1/search/tweets.json', params=kwargs) def searchGen(self, search_query, **kwargs): """ Returns a generator of tweets that match a specified query. @@ -383,7 +383,7 @@ class Twython(object): print result """ kwargs['q'] = search_query - content = self.get('https://search.twitter.com/search.json', params=kwargs) + content = self.get('https://api.twitter.com/1.1/search/tweets.json', params=kwargs) if not content['results']: raise StopIteration @@ -448,7 +448,7 @@ class Twython(object): return self._media_update(url, {'image': (file_, open(file_, 'rb'))}) - def updateStatusWithMedia(self, file_, version=1, **params): + def updateStatusWithMedia(self, file_, version='1.1', **params): """Updates the users status with media :param file_: (required) A string to the location of the file @@ -480,7 +480,7 @@ class Twython(object): ########################################################################### - def getProfileImageUrl(self, username, size='normal', version=1): + def getProfileImageUrl(self, username, size='normal', version='1.1'): """Gets the URL for the user's profile image. :param username: (required) Username, self explanatory.