Explicitly utf8 decode strings coming from Twitter.

Conflicts:

	twitter/api.py

diff --git a/twitter/api.py b/twitter/api.py
index 6927f51b81302b9da14a1e9edff73f9b3514adbd..3792826f02f4f5ef7144dbf87272da7427a2b08c 100644 (file)
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -149,11 +149,12 @@ class TwitterCall(object):
         try:
             handle = urllib2.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)
-        except urllib2.HTTPError, e:
+                return wrap_response(
+                    handle.read().decode('utf8'), handle.headers)
+        except urllib.HTTPError as e:
             if (e.code == 304):
                 return []
             else: