From: Kenneth Reitz <me@kennethreitz.com>
Date: Sat, 20 Aug 2011 23:49:23 +0000 (-0400)
Subject: remote read/close methods from response
X-Git-Tag: v0.8.0~94^2~146
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=86cc274cf01e38fd482c9e8be2e4c7f621340468;p=services%2Fpython-requests.git

remote read/close methods from response
---

diff --git a/requests/models.py b/requests/models.py
index db8a60e..12551ed 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -186,9 +186,7 @@ class Request(object):
 
             try:
                 response.headers = CaseInsensitiveDict(getattr(resp.info(), 'dict', None))
-                response.read = resp.read
                 response.fo = resp
-                response._close = resp.close
 
                 if self.cookiejar:
 
@@ -443,7 +441,7 @@ class Response(object):
                 return self._content
 
             # Read the contents.
-            self._content = self.read()
+            self._content = self.fo.read()
 
             # Decode GZip'd content.
             if 'gzip' in self.headers.get('content-encoding', ''):
@@ -462,19 +460,12 @@ class Response(object):
             raise AttributeError
 
 
-
     def raise_for_status(self):
         """Raises stored :class:`HTTPError` or :class:`URLError`, if one occured."""
         if self.error:
             raise self.error
 
 
-    def close(self):
-        if self.fo.fp is not None and hasattr(self.fo.fp, '_sock'):
-            self.fo.fp._sock.recv = None
-        self._close()
-
-
 
 class AuthManager(object):
     """Requests Authentication Manager."""