From fe7348cc530fab7375939dce9672a05c6864a2fa Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Tue, 8 May 2012 00:57:46 -0400
Subject: [PATCH] yay json

fixes #593
---
 requests/models.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/requests/models.py b/requests/models.py
index 62aeb9c5..1d6aa77a 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -7,6 +7,7 @@ requests.models
 This module contains the primary objects that power Requests.
 """
 
+import json
 import os
 from datetime import datetime
 
@@ -796,8 +797,6 @@ class Response(object):
         if self.encoding is None:
             if chardet is not None:
                 encoding = chardet.detect(self.content)['encoding']
-            else:
-                raise ValueError("Can't detect page encoding.")
 
         # Decode unicode from given encoding.
         try:
@@ -811,6 +810,14 @@ class Response(object):
 
         return content
 
+    @property
+    def json(self):
+        """Returns the json-encoded content of a request, if any."""
+        try:
+            return json.loads(self.text or self.content)
+        except ValueError:
+            return None
+
     def raise_for_status(self, allow_redirects=True):
         """Raises stored :class:`HTTPError` or :class:`URLError`, if one occurred."""