X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/8fd7289d7874f52c0eee780a05fe65b516d58a02..e4bec6bdddd1e2b2b0f4db950adf28d0b711f44a:/twitter/api.py diff --git a/twitter/api.py b/twitter/api.py index 9d50002..d1ded34 100644 --- a/twitter/api.py +++ b/twitter/api.py @@ -10,17 +10,23 @@ try: except ImportError: from io import BytesIO as StringIO -from twitter.twitter_globals import POST_ACTIONS -from twitter.auth import NoAuth +from .twitter_globals import POST_ACTIONS +from .auth import NoAuth import re import gzip +try: + import http.client as http_client +except ImportError: + import httplib as http_client + try: import json except ImportError: import simplejson as json + class _DEFAULT(object): pass @@ -41,12 +47,19 @@ class TwitterHTTPError(TwitterError): self.uri = uri self.format = format self.uriparts = uriparts - if self.e.headers['Content-Encoding'] == 'gzip': - buf = StringIO(self.e.fp.read()) + try: + data = self.e.fp.read() + except http_client.IncompleteRead as e: + # can't read the error text + # let's try some of it + data = e.partial + if self.e.headers.get('Content-Encoding') == 'gzip': + buf = StringIO(data) f = gzip.GzipFile(fileobj=buf) self.response_data = f.read() else: - self.response_data = self.e.fp.read() + self.response_data = data + super(TwitterHTTPError, self).__init__(str(self)) def __str__(self): fmt = ("." + self.format) if self.format else "" @@ -96,6 +109,8 @@ def wrap_response(response, headers): if response_typ is bool: # HURF DURF MY NAME IS PYTHON AND I CAN'T SUBCLASS bool. response_typ = int + elif response_typ is str: + return response class WrappedTwitterResponse(response_typ, TwitterResponse): __doc__ = TwitterResponse.__doc__ @@ -106,7 +121,6 @@ def wrap_response(response, headers): def __new__(cls, response, headers): return response_typ.__new__(cls, response) - return WrappedTwitterResponse(response, headers) @@ -115,7 +129,7 @@ class TwitterCall(object): def __init__( self, auth, format, domain, callable_cls, uri="", - uriparts=None, secure=True): + uriparts=None, secure=True, timeout=None, gzip=False): self.auth = auth self.format = format self.domain = domain @@ -123,6 +137,8 @@ class TwitterCall(object): self.uri = uri self.uriparts = uriparts self.secure = secure + self.timeout = timeout + self.gzip = gzip def __getattr__(self, k): try: @@ -131,9 +147,9 @@ class TwitterCall(object): def extend_call(arg): return self.callable_cls( auth=self.auth, format=self.format, domain=self.domain, - callable_cls=self.callable_cls, uriparts=self.uriparts \ - + (arg,), - secure=self.secure) + callable_cls=self.callable_cls, timeout=self.timeout, + secure=self.secure, gzip=self.gzip, + uriparts=self.uriparts + (arg,)) if k == "_": return extend_call else: @@ -167,7 +183,7 @@ class TwitterCall(object): _id = kwargs.pop('_id', None) if _id: kwargs['id'] = _id - + # If an _timeout is specified in kwargs, use it _timeout = kwargs.pop('_timeout', None) @@ -180,16 +196,45 @@ class TwitterCall(object): uriBase = "http%s://%s/%s%s%s" %( secure_str, self.domain, uri, dot, self.format) - headers = {'Accept-Encoding': 'gzip'} + # Catch media arguments to handle oauth query differently for multipart + media = None + for arg in ['media[]', 'banner', 'image']: + if arg in kwargs: + media = kwargs.pop(arg) + mediafield = arg + break + + headers = {'Accept-Encoding': 'gzip'} if self.gzip else dict() + body = None; arg_data = None if self.auth: headers.update(self.auth.generate_headers()) - arg_data = self.auth.encode_params(uriBase, method, kwargs) - if method == 'GET': + # Use urlencoded oauth args with no params when sending media + # via multipart and send it directly via uri even for post + arg_data = self.auth.encode_params(uriBase, method, + {} if media else kwargs ) + if method == 'GET' or media: uriBase += '?' + arg_data - body = None else: body = arg_data.encode('utf8') + # Handle query as multipart when sending media + if media: + BOUNDARY = "###Python-Twitter###" + bod = [] + bod.append('--' + BOUNDARY) + bod.append('Content-Disposition: form-data; name="%s"' % + mediafield) + bod.append('') + bod.append(media) + for k, v in kwargs.items(): + bod.append('--' + BOUNDARY) + bod.append('Content-Disposition: form-data; name="%s"' % k) + bod.append('') + bod.append(v) + bod.append('--' + BOUNDARY + '--') + body = '\r\n'.join(bod) + headers['Content-Type'] = 'multipart/form-data; boundary=%s' % BOUNDARY + req = urllib_request.Request(uriBase, body, headers) return self._handle_response(req, uri, arg_data, _timeout) @@ -201,14 +246,17 @@ class TwitterCall(object): handle = urllib_request.urlopen(req, **kwargs) if handle.headers['Content-Type'] in ['image/jpeg', 'image/png']: return handle - elif handle.info().get('Content-Encoding') == 'gzip': + try: + data = handle.read() + except http_client.IncompleteRead as e: + # Even if we don't get all the bytes we should have there + # may be a complete response in e.partial + data = e.partial + if handle.info().get('Content-Encoding') == 'gzip': # Handle gzip decompression - buf = StringIO(handle.read()) + buf = StringIO(data) f = gzip.GzipFile(fileobj=buf) data = f.read() - else: - data = handle.read() - if "json" == self.format: res = json.loads(data.decode('utf8')) return wrap_response(res, handle.headers) @@ -238,14 +286,11 @@ class Twitter(TwitterCall): t = Twitter( auth=OAuth(token, token_key, con_secret, con_secret_key))) - # Get the public timeline - t.statuses.public_timeline() - - # Get a particular friend's timeline - t.statuses.friends_timeline(id="billybob") + # Get your "home" timeline + t.statuses.home_timeline() - # Also supported (but totally weird) - t.statuses.friends_timeline.billybob() + # Get a particular friend's tweets + t.statuses.user_timeline(user_id="billybob") # Update your status t.statuses.update( @@ -262,7 +307,7 @@ class Twitter(TwitterCall): # Note how the magic `_` method can be used to insert data # into the middle of a call. You can also use replacement: t.user.list.members(user="tamtar", list="things-that-are-rad") - + # An *optional* `_timeout` parameter can also be used for API # calls which take much more time than normal or twitter stops # responding for some reasone @@ -274,13 +319,8 @@ class Twitter(TwitterCall): Searching Twitter:: - twitter_search = Twitter(domain="search.twitter.com") - - # Find the latest search trends - twitter_search.trends() - - # Search for the latest News on #gaza - twitter_search.search(q="#gaza") + # Search for the latest tweets about #pycon + t.search.tweets(q="#pycon") Using the data returned @@ -289,7 +329,7 @@ class Twitter(TwitterCall): Twitter API calls return decoded JSON. This is converted into a bunch of Python lists, dicts, ints, and strings. For example:: - x = twitter.statuses.public_timeline() + x = twitter.statuses.home_timeline() # The first 'tweet' in the timeline x[0] @@ -342,10 +382,7 @@ class Twitter(TwitterCall): raise ValueError("Unknown data format '%s'" %(format)) if api_version is _DEFAULT: - if domain == 'api.twitter.com': - api_version = '1.1' - else: - api_version = None + api_version = '1.1' uriparts = () if api_version: