From: Kenneth Reitz <me@kennethreitz.com>
Date: Wed, 17 Aug 2011 06:25:41 +0000 (-0400)
Subject: cookie session persistence
X-Git-Tag: v0.6.0~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=467766cfe8b2f4f13f5bee1346b9ab7a8cbfcb62;p=services%2Fpython-requests.git

cookie session persistence
---

diff --git a/requests/sessions.py b/requests/sessions.py
index 1ce9425..540089c 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -12,6 +12,7 @@ requests (cookies, auth, proxies).
 import cookielib
 
 from . import api
+from .utils import add_dict_to_cookiejar
 
 
 
@@ -58,6 +59,14 @@ class Session(object):
                 # Combine instance-local values with kwargs values, with
                 # priority to values in kwargs
                 kwargs = dict(inst_attrs.items() + kwargs.items())
+
+                # If a session request has a cookie_dict, inject the
+                # values into the existing CookieJar instead.
+                if isinstance(kwargs.get('cookies', None), dict):
+                    kwargs['cookies'] = add_dict_to_cookiejar(
+                        inst_attrs['cookies'], kwargs['cookies']
+                    )
+
                 return func(*args, **kwargs)
             return wrapper_func