Merge branch 'master' into py3-2

[z_archive/twitter.git] / twitter / api.py

diff --git a/twitter/api.py b/twitter/api.py
index 9803c4b103cc4d6466193b0a7d83cf89ccaa2565..f675822f03e2500f978568e10eb88e3d2c2d885a 100644 (file)
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -142,17 +142,18 @@ class TwitterCall(object):
                 uriBase += '?' + arg_data
                 body = None
             else:
-                body = arg_data
+                body = arg_data.encode('utf8')
 
         req = urllib.request.Request(uriBase, body, headers)
 
         try:
             handle = urllib.request.urlopen(req)
             if "json" == self.format:
-                res = json.loads(handle.read())
+                res = json.loads(handle.read().decode('utf8'))
                 return wrap_response(res, handle.headers)
             else:
-                return wrap_response(str(handle.read()), handle.headers)
+                return wrap_response(
+                    handle.read().decode('utf8'), handle.headers)
         except urllib.error.HTTPError as e:
             if (e.code == 304):
                 return []