From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Mon, 6 Aug 2012 22:37:28 +0000 (-0700)
Subject: properly handle send(prefetch=False)
X-Git-Tag: v0.13.7~15^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=030ead9c36b59d2e18f6381f3f8c96c6e4de0090;p=services%2Fpython-requests.git

properly handle send(prefetch=False)

fixes RequestsTestSuite.test_prefetch_return_response_interaction
---

diff --git a/requests/models.py b/requests/models.py
index 5908928..5556883 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -458,7 +458,7 @@ class Request(object):
         except ValueError:
             return False
 
-    def send(self, anyway=False, prefetch=True):
+    def send(self, anyway=False, prefetch=None):
         """Sends the request. Returns True if successful, False if not.
         If there was an HTTPError during transmission,
         self.response.status_code will contain the HTTPError code.
@@ -467,6 +467,9 @@ class Request(object):
 
         :param anyway: If True, request will be sent, even if it has
         already been sent.
+
+        :param prefetch: If not None, will override the request's own setting
+        for prefetch.
         """
 
         # Build the URL
@@ -626,7 +629,9 @@ class Request(object):
             self.__dict__.update(r.__dict__)
 
             # If prefetch is True, mark content as consumed.
-            if prefetch or self.prefetch:
+            if prefetch is None:
+                prefetch = self.prefetch
+            if prefetch:
                 # Save the response.
                 self.response.content