kennethreitz/requests
1
0
Fork 0
mirror of https://github.com/kennethreitz/requests.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix session CookieJars without breaking more stuff this time

Browse Source
This commit is contained in:
Chase Sterling
2013-04-25 23:15:50 -04:00
parent a7fef58756
commit 0c609b59ab
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
requests/sessions.py
+4 -5
View File
@@ -9,11 +9,10 @@ requests (cookies, auth, proxies).
"""
import os
from copy import copy
from datetime import datetime
from .compat import cookielib
from .cookies import cookiejar_from_dict, extract_cookies_to_jar
from .cookies import cookiejar_from_dict, extract_cookies_to_jar, RequestsCookieJar
from .models import Request, PreparedRequest
from .hooks import default_hooks, dispatch_hook
from .utils import from_key_val_list, default_headers
@@ -286,9 +285,9 @@ class Session(SessionRedirectMixin):
cookies = cookiejar_from_dict(cookies)
# Merge with session cookies
merged_cookies = copy(self.cookies)
for cookie in cookies:
merged_cookies.set_cookie(cookie)
merged_cookies = RequestsCookieJar()
merged_cookies.update(self.cookies)
merged_cookies.update(cookies)
cookies = merged_cookies
# Gather clues from the surrounding environment.