Merge 341fdd8f49 into 6dce7c9843

twython/twython.py

@@ -185,10 +185,15 @@ class Twython(object):
             'content': content,
         }
 
+
+        #  wrap the json loads in a try, and defer an error
+        #  why? twitter will return invalid json with an error code in the headers
+        json_error = False
         try:
             content = simplejson.loads(content)
         except ValueError:
-            raise TwythonError('Response was not valid JSON, unable to decode.')
+            json_error= True
+            content= {}
 
         if response.status_code > 304:
             # If there is no error message, use a default.
@@ -205,6 +210,10 @@ class Twython(object):
                                 error_code=response.status_code,
                                 retry_after=response.headers.get('retry-after'))
 
+        # if we have a json error here , then it's not an official TwitterAPI error
+        if json_error:
+            raise TwythonError('Response was not valid JSON, unable to decode.')
+
         return content
 
     '''