From: Kenneth Reitz <me@kennethreitz.com>
Date: Mon, 17 Dec 2012 03:03:55 +0000 (-0500)
Subject: json errors
X-Git-Tag: v1.0.0~60
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b141b326aa7d56bcf283c1936eee9e26fe3bd59;p=services%2Fpython-requests.git

json errors
---

diff --git a/requests/api.py b/requests/api.py
index ac0a642..730ed69 100644
--- a/requests/api.py
+++ b/requests/api.py
@@ -44,6 +44,7 @@ def request(method, url, **kwargs):
     if session is None:
         session = sessions.session(config=kwargs.get('config', None))
         adhoc_session = True
+        # Todo, close sessions after?
 
 
     return session.request(method=method, url=url, **kwargs)
diff --git a/requests/models.py b/requests/models.py
index 342d3e4..9972944 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -1048,14 +1048,10 @@ class Response(BaseResponse):
             # a best guess).
             encoding = guess_json_utf(self.content)
             if encoding is not None:
-                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
+                return json.loads(self.content.decode(encoding))
+
+        return json.loads(self.text or self.content)
+
 
     @property
     def links(self):