From 7ec0170a006e46144a924ae8e7e62d577e2195f7 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 16 Dec 2012 22:06:03 -0500 Subject: [PATCH] keep json None fo row --- requests/models.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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): -- 2.34.1