From: daftshady <daftonshady@gmail.com>
Date: Tue, 5 Nov 2013 16:10:27 +0000 (+0900)
Subject: double try statement
X-Git-Tag: v2.1.0~11^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b2255d0f8b0bb472ec2193e4ac5c4d28336a5eb;p=services%2Fpython-requests.git

double try statement
---

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: