projects
/
services
/
python-requests.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8b2255d
)
remove unnecessary try
author
daftshady
<daftonshady@gmail.com>
Wed, 6 Nov 2013 09:52:48 +0000
(18:52 +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 0fc343d2daa1e200b4d22f6f14e08922d71c1c89..c465f5521a16a3b48039d3f2799b58757a0dba09 100644
(file)
--- a/
requests/cookies.py
+++ b/
requests/cookies.py
@@
-437,11
+437,8
@@
def merge_cookies(cookiejar, cookies):
cookies, cookiejar=cookiejar, overwrite=False)
elif isinstance(cookies, cookielib.CookieJar):
try:
- try:
- cookiejar.update(cookies)
- except AttributeError:
- raise CookieJarError
- except CookieJarError:
+ cookiejar.update(cookies)
+ except AttributeError:
for cookie_in_jar in cookies:
cookiejar.set_cookie(cookie_in_jar)