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

update 'merge_cookies'

Browse Source
This commit is contained in:
daftshady
2013-11-05 16:15:35 +09:00
parent e40c1637c9
commit 30018e604c
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
requests/cookies.py
+2 -3
View File
@@ -433,9 +433,8 @@ def merge_cookies(cookiejar, cookies):
raise ValueError('You can only merge into CookieJar')
if isinstance(cookies, dict):
cookiejar.update(
cookiejar_from_dict(
cookies, cookiejar=cookiejar, overwrite=False))
cookiejar = cookiejar_from_dict(
cookies, cookiejar=cookiejar, overwrite=False)
elif isinstance(cookies, cookielib.CookieJar):
cookiejar.update(cookies)