From: Cory Benfield <lukasaoz@gmail.com>
Date: Wed, 11 Jul 2012 16:31:59 +0000 (+0100)
Subject: Do not hide SSLErrors behind Timeouts.
X-Git-Tag: v0.13.3~4^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=523906c54f23e0147cb8aacd3393ce6501a148fa;p=services%2Fpython-requests.git

Do not hide SSLErrors behind Timeouts.
---

diff --git a/requests/models.py b/requests/models.py
index 694d62a..acffc80 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -600,10 +600,10 @@ class Request(object):
                 raise ConnectionError(e)
 
             except (_SSLError, _HTTPError) as e:
-                if self.verify and isinstance(e, _SSLError):
+                if isinstance(e, _SSLError):
                     raise SSLError(e)
-
-                raise Timeout('Request timed out.')
+                else:
+                    raise Timeout('Request timed out.')
 
             # build_response can throw TooManyRedirects
             self._build_response(r)