If json.loads fails, carry on without raising an exception. Fixes #298

diff --git a/twitter/api.py b/twitter/api.py
index f291e506f8c1034d11d7170b20fa879c904ba32c..7b9d48bc812089595a49854bac0466fd358b093f 100644 (file)
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -68,10 +68,14 @@ class TwitterHTTPError(TwitterError):
             data = f.read()
         if len(data) == 0:
             data = {}
-        elif "json" == self.format:
-            data = json.loads(data.decode('utf8'))
         else:
             data = data.decode('utf8')
+            if "json" == self.format:
+                try:
+                    data = json.loads(data)
+                except ValueError:
+                    # We try to load the response as json as a nicety; if it fails, carry on.
+                    pass
         self.response_data = data
         super(TwitterHTTPError, self).__init__(str(self))