From 8b2255d0f8b0bb472ec2193e4ac5c4d28336a5eb Mon Sep 17 00:00:00 2001 From: daftshady Date: Wed, 6 Nov 2013 01:10:27 +0900 Subject: [PATCH] double try statement --- requests/cookies.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requests/cookies.py b/requests/cookies.py index 8ff8b02..0fc343d 100644 --- 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) - else: + except AttributeError: raise CookieJarError except CookieJarError: for cookie_in_jar in cookies: -- 2.34.1