projects
/
platform
/
upstream
/
python-requests.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e40c163
)
update 'merge_cookies'
author
daftshady
<daftonshady@gmail.com>
Tue, 5 Nov 2013 07:15:35 +0000
(16:15 +0900)
committer
daftshady
<daftonshady@gmail.com>
Tue, 26 Nov 2013 06:28:59 +0000
(15:28 +0900)
requests/cookies.py
patch
|
blob
|
history
diff --git
a/requests/cookies.py
b/requests/cookies.py
index
45c4685
..
df614a2
100644
(file)
--- a/
requests/cookies.py
+++ b/
requests/cookies.py
@@
-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)