Merge 6a3539882c into 4a181d3ac1

2013-04-08 10:30:11 -07:00 · 2013-04-08 10:30:11 -07:00 · 111b808904
commit 111b808904
parent 4a181d3ac1 6a3539882c
1 changed files with 6 additions and 1 deletions
--- a/twython/twython.py
+++ b/twython/twython.py
@ -186,7 +186,12 @@ class Twython(object):
        #  why? twitter will return invalid json with an error code in the headers
        json_error = False
        try:
-            content = content.json()
+            try:
+                # try to get json
+                content = content.json()
+            except AttributeError:
+                # if unicode detected
+                content = json.loads(content)
        except ValueError:
            json_error = True
            content = {}