From: Kenneth Reitz <me@kennethreitz.com>
Date: Sat, 5 Nov 2011 03:24:38 +0000 (-0400)
Subject: r.content is None of there's an invalid response.
X-Git-Tag: v0.7.5~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f7968b6797a50716a2f177ad23439a3c6bb9f683;p=services%2Fpython-requests.git

r.content is None of there's an invalid response.

Fixes #236
---

diff --git a/requests/models.py b/requests/models.py
index fd74ed5..9ad9e67 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -496,7 +496,11 @@ class Response(object):
                                'already consumed')
 
         # Read the contents.
-        self._content = self.raw.read()
+        try:
+            self._content = self.raw.read()
+        except AttributeError:
+            return None
+
 
         # Decode GZip'd content.
         if 'gzip' in self.headers.get('content-encoding', ''):
diff --git a/test_requests.py b/test_requests.py
index e68493e..ebff33d 100755
--- a/test_requests.py
+++ b/test_requests.py
@@ -529,6 +529,11 @@ class RequestsTestSuite(unittest.TestCase):
         assert params3['b'] in r3.content
         assert params3['c'] in r3.content
 
+    def test_invalid_content(self):
+
+        r = requests.get('http://somedomainthatclearlydoesntexistg.com')
+        assert r.content == None
+
 
 if __name__ == '__main__':
     unittest.main()