import urllib2
-from exceptions import Exception
-
from twitter.twitter_globals import POST_ACTIONS
from twitter.auth import NoAuth
httplib.HTTPHeaders instance. You can do
`response.headers.getheader('h')` to retrieve a header.
"""
- def __init__(self, real_response, headers):
- self._real_response = real_response
+ def __init__(self, headers):
self.headers = headers
- def __getattr__(self, k):
- try:
- return object.__getattr__(self, k)
- except AttributeError:
- return getattr(self._real_response, k)
-
- def __iter__(self):
- return iter(self._real_response)
-
@property
def rate_limit_remaining(self):
"""
return int(self.headers.getheader('X-RateLimit-Reset'))
+def wrap_response(response, headers):
+ response_typ = type(response)
+ if response_typ is bool:
+ # HURF DURF MY NAME IS PYTHON AND I CAN'T SUBCLASS bool.
+ response_typ = int
+
+ class WrappedTwitterResponse(response_typ, TwitterResponse):
+ __doc__ = TwitterResponse.__doc__
+
+ def __init__(self, response):
+ if response_typ is not int:
+ response_typ.__init__(self, response)
+ TwitterResponse.__init__(self, headers)
+
+ return WrappedTwitterResponse(response)
+
+
+
class TwitterCall(object):
def __init__(
self, auth, format, domain, uri="", agent=None,
for uripart in self.uriparts:
# If this part matches a keyword argument, use the
# supplied value otherwise, just use the part.
- uriparts.append(kwargs.pop(uripart, uripart))
- uri = '/'.join(uriparts)
+ uriparts.append(unicode(kwargs.pop(uripart, uripart)))
+ uri = u'/'.join(uriparts)
method = "GET"
for action in POST_ACTIONS:
try:
handle = urllib2.urlopen(req)
if "json" == self.format:
- msg_data = json.loads(handle.read())
+ res = json.loads(handle.read().decode('utf8'))
+ return wrap_response(res, handle.headers)
else:
- msg_data = handle.read()
- return TwitterResponse(msg_data, handle.headers)
- except urllib2.HTTPError, e:
+ return wrap_response(
+ handle.read().decode('utf8'), handle.headers)
+ except urllib2.HTTPError as e:
if (e.code == 304):
return []
else:
secure=secure, uriparts=uriparts)
-__all__ = ["Twitter", "TwitterError", "TwitterHTTPError"]
+__all__ = ["Twitter", "TwitterError", "TwitterHTTPError", "TwitterResponse"]