From: daftshady <daftonshady@gmail.com>
Date: Wed, 6 Nov 2013 09:52:48 +0000 (+0900)
Subject: remove unnecessary try
X-Git-Tag: v2.1.0~11^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8eb40c777e4a5d0967205404a170615eb96ca237;p=services%2Fpython-requests.git

remove unnecessary try
---

diff --git a/requests/cookies.py b/requests/cookies.py
index 0fc343d..c465f55 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)