From: Kenneth Reitz <me@kennethreitz.com>
Date: Mon, 17 Dec 2012 03:06:03 +0000 (-0500)
Subject: keep json None fo row
X-Git-Tag: v1.0.0~59
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7ec0170a006e46144a924ae8e7e62d577e2195f7;p=services%2Fpython-requests.git

keep json None fo row
---

diff --git a/requests/models.py b/requests/models.py
index 9972944..342d3e4 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -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):