from twitter.twitter_globals import POST_ACTIONS
from twitter.auth import NoAuth
+import re
+
try:
import json
except ImportError:
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):
"""
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)
try:
return object.__getattr__(self, k)
except AttributeError:
- return self.callable_cls(
- auth=self.auth, format=self.format, domain=self.domain,
- callable_cls=self.callable_cls, 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.
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.