From: Hank Gay <whg@us.ibm.com>
Date: Tue, 17 Jan 2012 16:24:50 +0000 (-0500)
Subject: Allow mixing sessions and async.
X-Git-Tag: v0.10.0~24^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8efb6cc870bd23de0d8d87708217d818236a733f;p=services%2Fpython-requests.git

Allow mixing sessions and async.
---

diff --git a/requests/models.py b/requests/models.py
index c45b18a..b7fe844 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -57,7 +57,8 @@ class Request(object):
         hooks=None,
         config=None,
         _poolmanager=None,
-        verify=None):
+        verify=None,
+        session=None):
 
         #: Float describes the timeout of the request.
         #  (Use socket.setdefaulttimeout() as fallback)
@@ -116,7 +117,7 @@ class Request(object):
         self.hooks = hooks
 
         #: Session.
-        self.session = None
+        self.session = session
 
         #: SSL Verification.
         self.verify = verify
@@ -246,7 +247,8 @@ class Request(object):
                     timeout=self.timeout,
                     _poolmanager=self._poolmanager,
                     proxies = self.proxies,
-                    verify = self.verify
+                    verify = self.verify,
+                    session = self.session
                 )
 
                 request.send()