From: Kenneth Reitz <me@kennethreitz.com>
Date: Fri, 14 Oct 2011 00:11:25 +0000 (-0400)
Subject: _return_request => return_response
X-Git-Tag: v0.6.3^2~2^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9518d053a4423a58f1a835b1f721179ba2f1bd4f;p=services%2Fpython-requests.git

_return_request => return_response
---

diff --git a/requests/api.py b/requests/api.py
index e22ba42..e9fd9e7 100644
--- a/requests/api.py
+++ b/requests/api.py
@@ -17,13 +17,12 @@ from .status_codes import codes
 from .hooks import dispatch_hook
 from .utils import cookiejar_from_dict
 
-from urlparse import urlparse
 
 __all__ = ('request', 'get', 'head', 'post', 'patch', 'put', 'delete')
 
 def request(method, url,
     params=None, data=None, headers=None, cookies=None, files=None, auth=None,
-    timeout=None, allow_redirects=False, proxies=None, hooks=None):
+    timeout=None, allow_redirects=False, proxies=None, hooks=None, return_response=True):
 
     """Constructs and sends a :class:`Request <models.Request>`.
     Returns :class:`Response <models.Response>` object.
@@ -68,6 +67,10 @@ def request(method, url,
     # Pre-request hook.
     r = dispatch_hook('pre_request', hooks, r)
 
+    # Don't send if asked nicely.
+    if not return_response:
+        return r
+
     # Send the HTTP Request.
     r.send()
 
diff --git a/requests/async.py b/requests/async.py
index 9517064..6599c8a 100644
--- a/requests/async.py
+++ b/requests/async.py
@@ -33,7 +33,7 @@ def _patched(f):
     """Patches a given API function to not send."""
 
     def wrapped(*args, **kwargs):
-        return f(*args, _return_request=True, **kwargs)
+        return f(*args, return_response=False, **kwargs)
 
     return wrapped