diff --git a/README.markdown b/README.markdown index 629ca67..ccb9f04 100644 --- a/README.markdown +++ b/README.markdown @@ -147,3 +147,4 @@ me and let me know (or just issue a pull request on GitHub, and leave a note abo - **[Remy DeCausemaker (decause)](https://github.com/decause)**, PEP-8 contributions. - **[mckellister](https://github.com/mckellister)**, Fixes to `Exception`s raised by Twython (Rate Limits, etc). - **[tatz_tsuchiya](http://d.hatena.ne.jp/tatz_tsuchiya/20120115/1326623451)**, Fix for `lambda` scoping in key injection phase. +- **[Voulnet (Mohammed ALDOUB)](https://github.com/Voulnet)**, Fixes for `http`/`https` access endpoints diff --git a/README.txt b/README.txt index b281c3f..ccb9f04 100644 --- a/README.txt +++ b/README.txt @@ -57,10 +57,9 @@ Streaming API ---------------------------------------------------------------------------------------------------- Twython, as of v1.5.0, now includes an experimental **[Twitter Streaming API](https://dev.twitter.com/docs/streaming-api)** handler. Usage is as follows; it's designed to be open-ended enough that you can adapt it to higher-level (read: Twitter must give you access) -streams. This also exists in large part (read: pretty much in full) thanks to the excellent **[python-requests](http://docs.python-requests.org/en/latest/) library by +streams. This also exists in large part (read: pretty much in full) thanks to the excellent **[python-requests](http://docs.python-requests.org/en/latest/)** library by Kenneth Reitz. - -**Example Usage:** + ``` python import json from twython import Twython @@ -77,7 +76,7 @@ Twython.stream({ 'track': 'python' }, on_results) ``` - + A note about the development of Twython (specifically, 1.3) ---------------------------------------------------------------------------------------------------- @@ -147,4 +146,5 @@ me and let me know (or just issue a pull request on GitHub, and leave a note abo - **[Mesar Hameed (mhameed)](https://github.com/mhameed)**, Commit to swap `__getattr__` trick for a more debuggable solution. - **[Remy DeCausemaker (decause)](https://github.com/decause)**, PEP-8 contributions. - **[mckellister](https://github.com/mckellister)**, Fixes to `Exception`s raised by Twython (Rate Limits, etc). -- **[tatz_tsuchiya](http://d.hatena.ne.jp/tatz_tsuchiya/20120115/1326623451), Fix for `lambda` scoping in key injection phase. +- **[tatz_tsuchiya](http://d.hatena.ne.jp/tatz_tsuchiya/20120115/1326623451)**, Fix for `lambda` scoping in key injection phase. +- **[Voulnet (Mohammed ALDOUB)](https://github.com/Voulnet)**, Fixes for `http`/`https` access endpoints diff --git a/twython/twython.py b/twython/twython.py index b08f376..98f7188 100644 --- a/twython/twython.py +++ b/twython/twython.py @@ -127,6 +127,7 @@ class APILimit(TwythonError): DEPRECATED, import and catch TwythonAPILimit instead. """ + def __init__(self, msg, error_code=None): self.msg = '%s\n Notice: APILimit is deprecated and soon to be removed, catch on TwythonRateLimitLimit instead!' % msg self.error_code = error_code @@ -139,6 +140,7 @@ class AuthError(TwythonError): """ Raised when you try to access a protected resource and it fails due to some issue with your authentication. """ + def __init__(self, msg, error_code=None): self.msg = '%s\n Notice: AuthError is deprecated and soon to be removed, catch on TwythonAuthError instead!' % msg self.error_code = error_code @@ -173,11 +175,11 @@ class Twython(object): OAuthHook.consumer_secret = twitter_secret # Needed for hitting that there API. - self.request_token_url = 'http://twitter.com/oauth/request_token' - self.access_token_url = 'http://twitter.com/oauth/access_token' - self.authorize_url = 'http://twitter.com/oauth/authorize' - self.authenticate_url = 'http://twitter.com/oauth/authenticate' - self.api_url = 'http://api.twitter.com/%s/' + self.request_token_url = 'https://twitter.com/oauth/request_token' + self.access_token_url = 'https://twitter.com/oauth/access_token' + self.authorize_url = 'https://twitter.com/oauth/authorize' + self.authenticate_url = 'https://twitter.com/oauth/authenticate' + self.api_url = 'https://api.twitter.com/%s/' self.twitter_token = twitter_token self.twitter_secret = twitter_secret @@ -232,8 +234,7 @@ class Twython(object): return content def _request(self, url, method='GET', params=None, api_call=None): - ''' - Internal response generator, not sense in repeating the same + '''Internal response generator, no sense in repeating the same code twice, right? ;) ''' myargs = {} @@ -295,7 +296,7 @@ class Twython(object): # In case they want to pass a full Twitter URL # i.e. http://search.twitter.com/ - if endpoint.startswith('http://'): + if endpoint.startswith('http://') or endpoint.startswith('https://'): url = endpoint else: url = '%s%s.json' % (self.api_url % version, endpoint) @@ -415,11 +416,7 @@ class Twython(object): if request.status_code in [301, 201, 200]: return request.text else: - raise TwythonError('shortenURL() failed with a %s error code.' % request.status_code , request.status_code ) - - @staticmethod - def constructApiURL(base_url, params): - return base_url + "?" + "&".join(["%s=%s" % (Twython.unicode2utf8(key), urllib.quote_plus(Twython.unicode2utf8(value))) for (key, value) in params.iteritems()]) + raise TwythonError('shortenURL() failed with a %s error code.' % request.status_code, request.status_code) def bulkUserLookup(self, ids=None, screen_names=None, version=1, **kwargs): """ A method to do bulk user lookups against the Twitter API. @@ -479,6 +476,9 @@ class Twython(object): e.g x.search(q='jjndf', page='2') """ + if 'q' in kwargs: + kwargs['q'] = urllib.quote_plus(Twython.unicode2utf8(kwargs['q'])) + return self.get('http://search.twitter.com/search.json', params=kwargs) def searchGen(self, search_query, **kwargs): @@ -492,7 +492,7 @@ class Twython(object): for result in search: print result """ - kwargs['q'] = search_query + kwargs['q'] = urllib.quote_plus(Twython.unicode2utf8(search_query)) content = self.get('http://search.twitter.com/search.json', params=kwargs) if not content['results']: @@ -682,7 +682,7 @@ class Twython(object): req = requests.post(url, data=params, files=file_, headers=self.headers) return req.content - def getProfileImageUrl(self, username, size=None, version=1): + def getProfileImageUrl(self, username, size='normal', version=1): """ getProfileImageUrl(username) Gets the URL for the user's profile image. @@ -692,20 +692,17 @@ class Twython(object): size - Optional. Image size. Valid options include 'normal', 'mini' and 'bigger'. Defaults to 'normal' if not given. version (number) - Optional. API version to request. Entire Twython class defaults to 1, but you can override on a function-by-function or class basis - (version=2), etc. """ - url = "http://api.twitter.com/%s/users/profile_image/%s.json" % \ - (version, username) - if size: - url = self.constructApiURL(url, {'size': size}) + endpoint = 'users/profile_image/%s' % username + url = self.api_url % version + endpoint + '?' + urllib.urlencode({'size': size}) - #client.follow_redirects = False response = self.client.get(url, allow_redirects=False) image_url = response.headers.get('location') if response.status_code in (301, 302, 303, 307) and image_url is not None: return image_url - - raise TwythonError("getProfileImageUrl() failed with a %d error code." % response.status_code, response.status_code) + else: + raise TwythonError('getProfileImageUrl() threw an error.', error_code=response.status_code) @staticmethod def stream(data, callback): diff --git a/twython3k/twython.py b/twython3k/twython.py index 6296e82..c8f03b9 100644 --- a/twython3k/twython.py +++ b/twython3k/twython.py @@ -144,10 +144,10 @@ class Twython(object): ** Note: versioning is not currently used by search.twitter functions; when Twitter moves their junk, it'll be supported. """ # Needed for hitting that there API. - self.request_token_url = 'http://twitter.com/oauth/request_token' - self.access_token_url = 'http://twitter.com/oauth/access_token' - self.authorize_url = 'http://twitter.com/oauth/authorize' - self.authenticate_url = 'http://twitter.com/oauth/authenticate' + self.request_token_url = 'https://twitter.com/oauth/request_token' + self.access_token_url = 'https://twitter.com/oauth/access_token' + self.authorize_url = 'https://twitter.com/oauth/authorize' + self.authenticate_url = 'https://twitter.com/oauth/authenticate' self.twitter_token = twitter_token self.twitter_secret = twitter_secret self.oauth_token = oauth_token @@ -297,7 +297,7 @@ class Twython(object): if screen_names: kwargs['screen_name'] = ','.join(screen_names) - lookupURL = Twython.constructApiURL("http://api.twitter.com/%d/users/lookup.json" % version, kwargs) + lookupURL = Twython.constructApiURL("https://api.twitter.com/%d/users/lookup.json" % version, kwargs) try: resp, content = self.client.request(lookupURL, "POST", headers = self.headers) return simplejson.loads(content.decode('utf-8')) @@ -314,7 +314,7 @@ class Twython(object): e.g x.search(q = "jjndf", page = '2') """ - searchURL = Twython.constructApiURL("http://search.twitter.com/search.json", kwargs) + searchURL = Twython.constructApiURL("https://search.twitter.com/search.json", kwargs) try: resp, content = self.client.request(searchURL, "GET", headers = self.headers) return simplejson.loads(content.decode('utf-8')) @@ -337,7 +337,7 @@ class Twython(object): e.g x.searchGen("python", page="2") or x.searchGen(search_query = "python", page = "2") """ - searchURL = Twython.constructApiURL("http://search.twitter.com/search.json?q=%s" % Twython.unicode2utf8(search_query), kwargs) + searchURL = Twython.constructApiURL("https://search.twitter.com/search.json?q=%s" % Twython.unicode2utf8(search_query), kwargs) try: resp, content = self.client.request(searchURL, "GET", headers = self.headers) data = simplejson.loads(content.decode('utf-8')) @@ -385,7 +385,7 @@ class Twython(object): version (number) - Optional. API version to request. Entire Twython class defaults to 1, but you can override on a function-by-function or class basis - (version=2), etc. """ try: - resp, content = self.client.request("http://api.twitter.com/%d/%s/%s/members/%s.json" % (version, username, list_id, repr(id)), headers = self.headers) + resp, content = self.client.request("https://api.twitter.com/%d/%s/%s/members/%s.json" % (version, username, list_id, repr(id)), headers = self.headers) return simplejson.loads(content.decode('utf-8')) except HTTPError as e: raise TwythonError("isListMember() failed with a %d error code." % e.code, e.code) @@ -404,7 +404,7 @@ class Twython(object): version (number) - Optional. API version to request. Entire Twython class defaults to 1, but you can override on a function-by-function or class basis - (version=2), etc. """ try: - resp, content = self.client.request("http://api.twitter.com/%d/%s/%s/following/%s.json" % (version, username, list_id, repr(id)), headers = self.headers) + resp, content = self.client.request("https://api.twitter.com/%d/%s/%s/following/%s.json" % (version, username, list_id, repr(id)), headers = self.headers) return simplejson.loads(content.decode('utf-8')) except HTTPError as e: raise TwythonError("isListMember() failed with a %d error code." % e.code, e.code) @@ -426,7 +426,7 @@ class Twython(object): fields = [] content_type, body = Twython.encode_multipart_formdata(fields, files) headers = {'Content-Type': content_type, 'Content-Length': str(len(body))} - r = urllib.request.Request("http://api.twitter.com/%d/account/update_profile_background_image.json?tile=%s" % (version, tile), body, headers) + r = urllib.request.Request("https://api.twitter.com/%d/account/update_profile_background_image.json?tile=%s" % (version, tile), body, headers) return urllib.request.urlopen(r).read() except HTTPError as e: raise TwythonError("updateProfileBackgroundImage() failed with a %d error code." % e.code, e.code) @@ -445,7 +445,7 @@ class Twython(object): fields = [] content_type, body = Twython.encode_multipart_formdata(fields, files) headers = {'Content-Type': content_type, 'Content-Length': str(len(body))} - r = urllib.request.Request("http://api.twitter.com/%d/account/update_profile_image.json" % version, body, headers) + r = urllib.request.Request("https://api.twitter.com/%d/account/update_profile_image.json" % version, body, headers) return urllib.request.urlopen(r).read() except HTTPError as e: raise TwythonError("updateProfileImage() failed with a %d error code." % e.code, e.code)