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 json
+ import http.client as http_client
except ImportError:
- import simplejson as json
+ import httplib as http_client
+
+import 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
- if self.e.headers['Content-Encoding'] == 'gzip':
+ if self.e.headers.get('Content-Encoding') == 'gzip':
buf = StringIO(data)
f = gzip.GzipFile(fileobj=buf)
self.response_data = f.read()
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)
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: