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:
5fcaf45
)
double try statement
author
daftshady
<daftonshady@gmail.com>
Tue, 5 Nov 2013 16:10:27 +0000
(
01:10
+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
8ff8b02
..
0fc343d
100644
(file)
--- a/
requests/cookies.py
+++ b/
requests/cookies.py
@@
-437,9
+437,9
@@
def merge_cookies(cookiejar, cookies):
cookies, cookiejar=cookiejar, overwrite=False)
elif isinstance(cookies, cookielib.CookieJar):
try:
-
if hasattr(cookiejar, 'update')
:
+
try
:
cookiejar.update(cookies)
- e
lse
:
+ e
xcept AttributeError
:
raise CookieJarError
except CookieJarError:
for cookie_in_jar in cookies: