From b5c136152f4184387017ce570d2a499f21b6de14 Mon Sep 17 00:00:00 2001
From: Robert Estelle <robert@btbapp.com>
Date: Tue, 30 Jul 2013 21:39:36 -0700
Subject: [PATCH] Prepare requests with session settings separately from
 sending.

---
 requests/models.py   | 13 +++++++++
 requests/sessions.py | 82 ++++++++++++++++++++++++++++++----------------------
 2 files changed, 61 insertions(+), 34 deletions(-)

diff --git a/requests/models.py b/requests/models.py
index 2439153..2aacfbf 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -214,6 +214,19 @@ class Request(RequestHooksMixin):
     def __repr__(self):
         return '<Request [%s]>' % (self.method)
 
+    def copy(self):
+        return Request(
+            method = self.method,
+            url = self.url,
+            headers = self.headers,
+            files = self.files,
+            data = self.data,
+            params = self.params,
+            auth = self.auth,
+            cookies = self.cookies,
+            hooks = self.hooks,
+        )
+
     def prepare(self):
         """Constructs a :class:`PreparedRequest <PreparedRequest>` for transmission and returns it."""
         p = PreparedRequest()
diff --git a/requests/sessions.py b/requests/sessions.py
index 664465d..ce3064b 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -228,6 +228,41 @@ class Session(SessionRedirectMixin):
     def __exit__(self, *args):
         self.close()
 
+    def update_request(self, request):
+        """Destructively updates/merges the settings of a :class:`Request`
+        object from those of the :class:`Session`.
+        """
+        cookies = request.cookies or {}
+
+        # Bootstrap CookieJar.
+        if not isinstance(cookies, cookielib.CookieJar):
+            cookies = cookiejar_from_dict(cookies)
+
+        # Merge with session cookies
+        merged_cookies = RequestsCookieJar()
+        merged_cookies.update(self.cookies)
+        merged_cookies.update(cookies)
+        request.cookies = merged_cookies
+
+        # Gather clues from the surrounding environment.
+        if self.trust_env:
+            # Set environment's basic authentication if not explicitly set.
+            if not request.auth and not self.auth:
+                request.auth = get_netrc_auth(request.url)
+
+        # Merge settings from the request and the session.
+        request.params = merge_setting(request.params, self.params)
+        request.headers = merge_setting(request.headers, self.headers, dict_class=CaseInsensitiveDict)
+        request.auth = merge_setting(request.auth, self.auth)
+        request.hooks = merge_setting(request.hooks, self.hooks)
+        request.method = request.method.upper()
+
+        return request
+
+    def prepare_request(self, request):
+        req = self.update_request(request.copy())
+        return req.prepare()
+
     def request(self, method, url,
         params=None,
         data=None,
@@ -271,20 +306,22 @@ class Session(SessionRedirectMixin):
         :param cert: (optional) if String, path to ssl client cert file (.pem).
             If Tuple, ('cert', 'key') pair.
         """
+        # Create the Request.
+        req = Request(
+            method = method.upper(),
+            url = url,
+            headers = headers,
+            files = files,
+            data = data or {},
+            params = params or {},
+            auth = auth,
+            cookies = cookies,
+            hooks = hooks,
+        )
+        prep = self.prepare_request(req)
 
-        cookies = cookies or {}
         proxies = proxies or {}
 
-        # Bootstrap CookieJar.
-        if not isinstance(cookies, cookielib.CookieJar):
-            cookies = cookiejar_from_dict(cookies)
-
-        # Merge with session cookies
-        merged_cookies = RequestsCookieJar()
-        merged_cookies.update(self.cookies)
-        merged_cookies.update(cookies)
-        cookies = merged_cookies
-
         # Gather clues from the surrounding environment.
         if self.trust_env:
             # Set environment's proxies.
@@ -292,10 +329,6 @@ class Session(SessionRedirectMixin):
             for (k, v) in env_proxies.items():
                 proxies.setdefault(k, v)
 
-            # Set environment's basic authentication if not explicitly set.
-            if not auth and not self.auth:
-                auth = get_netrc_auth(url)
-
             # Look for configuration.
             if not verify and verify is not False:
                 verify = os.environ.get('REQUESTS_CA_BUNDLE')
@@ -305,30 +338,11 @@ class Session(SessionRedirectMixin):
                 verify = os.environ.get('CURL_CA_BUNDLE')
 
         # Merge all the kwargs.
-        params = merge_setting(params, self.params)
-        headers = merge_setting(headers, self.headers, dict_class=CaseInsensitiveDict)
-        auth = merge_setting(auth, self.auth)
         proxies = merge_setting(proxies, self.proxies)
-        hooks = merge_setting(hooks, self.hooks)
         stream = merge_setting(stream, self.stream)
         verify = merge_setting(verify, self.verify)
         cert = merge_setting(cert, self.cert)
 
-        # Create the Request.
-        req = Request()
-        req.method = method.upper()
-        req.url = url
-        req.headers = headers
-        req.files = files
-        req.data = data
-        req.params = params
-        req.auth = auth
-        req.cookies = cookies
-        req.hooks = hooks
-
-        # Prepare the Request.
-        prep = req.prepare()
-
         # Send the request.
         send_kwargs = {
             'stream': stream,
-- 
2.7.4