keep json None fo row
authorKenneth Reitz <me@kennethreitz.com>
Mon, 17 Dec 2012 03:06:03 +0000 (22:06 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 17 Dec 2012 03:06:03 +0000 (22:06 -0500)
requests/models.py

index 9972944..342d3e4 100644 (file)
@@ -1048,10 +1048,14 @@ class Response(BaseResponse):
             # a best guess).
             encoding = guess_json_utf(self.content)
             if encoding is not None:
-                return json.loads(self.content.decode(encoding))
-
-        return json.loads(self.text or self.content)
-
+                try:
+                    return json.loads(self.content.decode(encoding))
+                except (ValueError, UnicodeDecodeError):
+                    pass
+        try:
+            return json.loads(self.text or self.content)
+        except ValueError:
+            return None
 
     @property
     def links(self):