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
-import httplib
+
+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
self.uriparts = uriparts
try:
data = self.e.fp.read()
- except httplib.IncompleteRead, e:
+ except http_client.IncompleteRead as e:
# can't read the error text
# let's try some of it
data = e.partial
self.response_data = f.read()
else:
self.response_data = data
+ super(TwitterHTTPError, self).__init__(str(self))
def __str__(self):
fmt = ("." + self.format) if self.format else ""
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__
def __new__(cls, response, headers):
return response_typ.__new__(cls, response)
-
return WrappedTwitterResponse(response, headers)
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
self.uri = uri
self.uriparts = uriparts
self.secure = secure
+ self.timeout = timeout
+ self.gzip = gzip
def __getattr__(self, k):
try:
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:
uriBase = "http%s://%s/%s%s%s" %(
secure_str, self.domain, uri, dot, self.format)
- headers = {'Accept-Encoding': 'gzip'}
+ 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':
uriBase += '?' + arg_data
- body = None
else:
body = arg_data.encode('utf8')
return handle
try:
data = handle.read()
- except httplib.IncompleteRead, e:
+ 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
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: