From 8eb40c777e4a5d0967205404a170615eb96ca237 Mon Sep 17 00:00:00 2001 From: daftshady Date: Wed, 6 Nov 2013 18:52:48 +0900 Subject: [PATCH] remove unnecessary try --- requests/cookies.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/requests/cookies.py b/requests/cookies.py index 0fc343d2..c465f552 100644 --- 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)