X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/d5f58e6e509a562e021442f011ec6277a4a75561..2ee6567201124ddf8726d3d688e0f9a52b8069a6:/twitter/api.py diff --git a/twitter/api.py b/twitter/api.py index f675822..2a9f935 100644 --- a/twitter/api.py +++ b/twitter/api.py @@ -1,17 +1,23 @@ -import urllib.request, urllib.error, urllib.parse +try: + import urllib.request as urllib_request + import urllib.error as urllib_error +except ImportError: + import urllib2 as urllib_request + import urllib2 as urllib_error from twitter.twitter_globals import POST_ACTIONS from twitter.auth import NoAuth -def _py26OrGreater(): - import sys - return sys.hexversion > 0x20600f0 +import re -if _py26OrGreater(): +try: import json -else: +except ImportError: import simplejson as json +class _DEFAULT(object): + pass + class TwitterError(Exception): """ Base Exception thrown by the Twitter object when there is a @@ -25,17 +31,19 @@ class TwitterHTTPError(TwitterError): HTTP error interacting with twitter.com. """ def __init__(self, e, uri, format, uriparts): - self.e = e - self.uri = uri - self.format = format - self.uriparts = uriparts + self.e = e + self.uri = uri + self.format = format + self.uriparts = uriparts + self.response_data = self.e.fp.read() def __str__(self): + fmt = ("." + self.format) if self.format else "" return ( - "Twitter sent status %i for URL: %s.%s using parameters: " + "Twitter sent status %i for URL: %s%s using parameters: " "(%s)\ndetails: %s" %( - self.e.code, self.uri, self.format, self.uriparts, - self.e.fp.read())) + self.e.code, self.uri, fmt, self.uriparts, + self.response_data)) class TwitterResponse(object): """ @@ -74,24 +82,27 @@ def wrap_response(response, headers): class WrappedTwitterResponse(response_typ, TwitterResponse): __doc__ = TwitterResponse.__doc__ - def __init__(self, response): - if response_typ is not int: - response_typ.__init__(self, response) + def __init__(self, response, headers): + response_typ.__init__(self, response) TwitterResponse.__init__(self, headers) + def __new__(cls, response, headers): + return response_typ.__new__(cls, response) + - return WrappedTwitterResponse(response) + return WrappedTwitterResponse(response, headers) class TwitterCall(object): + def __init__( - self, auth, format, domain, uri="", agent=None, + self, auth, format, domain, callable_cls, uri="", uriparts=None, secure=True): self.auth = auth self.format = format self.domain = domain + self.callable_cls = callable_cls self.uri = uri - self.agent = agent self.uriparts = uriparts self.secure = secure @@ -99,10 +110,16 @@ class TwitterCall(object): try: return object.__getattr__(self, k) except AttributeError: - return TwitterCall( - auth=self.auth, format=self.format, domain=self.domain, - agent=self.agent, uriparts=self.uriparts + (k,), - secure=self.secure) + 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) + if k == "_": + return extend_call + else: + return extend_call(k) def __call__(self, **kwargs): # Build the uri. @@ -113,11 +130,13 @@ class TwitterCall(object): uriparts.append(str(kwargs.pop(uripart, uripart))) uri = '/'.join(uriparts) - method = "GET" - for action in POST_ACTIONS: - if uri.endswith(action): - method = "POST" - break + method = kwargs.pop('_method', None) + if not method: + method = "GET" + for action in POST_ACTIONS: + if re.search("%s(/\d+)?$" % action, uri): + method = "POST" + break # If an id kwarg is present and there is no id to fill in in # the list of uriparts, assume the id goes at the end. @@ -144,17 +163,19 @@ class TwitterCall(object): else: body = arg_data.encode('utf8') - req = urllib.request.Request(uriBase, body, headers) + req = urllib_request.Request(uriBase, body, headers) + return self._handle_response(req, uri, arg_data) + def _handle_response(self, req, uri, arg_data): try: - handle = urllib.request.urlopen(req) + handle = urllib_request.urlopen(req) if "json" == self.format: res = json.loads(handle.read().decode('utf8')) return wrap_response(res, handle.headers) else: return wrap_response( handle.read().decode('utf8'), handle.headers) - except urllib.error.HTTPError as e: + except urllib_error.HTTPError as e: if (e.code == 304): return [] else: @@ -235,8 +256,8 @@ class Twitter(TwitterCall): """ def __init__( self, format="json", - domain="twitter.com", secure=True, auth=None, - api_version=''): + domain="api.twitter.com", secure=True, auth=None, + api_version=_DEFAULT): """ Create a new twitter API connector. @@ -249,20 +270,14 @@ class Twitter(TwitterCall): `domain` lets you change the domain you are connecting. By - default it's twitter.com but `search.twitter.com` may be + default it's `api.twitter.com` but `search.twitter.com` may be useful too. If `secure` is False you will connect with HTTP instead of HTTPS. - The value of `agent` is sent in the `X-Twitter-Client` - header. This is deprecated. Instead Twitter determines the - application using the OAuth Client Key and Client Key Secret - parameters. - `api_version` is used to set the base uri. By default it's - nothing, but if you set it to '1' your URI will start with - '1/'. + '1'. If you are using "search.twitter.com" set this to None. """ if not auth: auth = NoAuth() @@ -270,12 +285,19 @@ class Twitter(TwitterCall): if (format not in ("json", "xml", "")): raise ValueError("Unknown data format '%s'" %(format)) + if api_version is _DEFAULT: + if domain == 'api.twitter.com': + api_version = '1' + else: + api_version = None + uriparts = () if api_version: uriparts += (str(api_version),) TwitterCall.__init__( self, auth=auth, format=format, domain=domain, + callable_cls=TwitterCall, secure=secure, uriparts=uriparts)