mirror of
https://github.com/kennethreitz/requests.git
synced 2026-06-05 22:50:18 +00:00
double try statement
This commit is contained in:
+2
-2
@@ -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)
|
||||
else:
|
||||
except AttributeError:
|
||||
raise CookieJarError
|
||||
except CookieJarError:
|
||||
for cookie_in_jar in cookies:
|
||||
|
||||
Reference in New Issue
Block a user