From 4f49f6b3ed99cf73feaec762f96f44574ac54134 Mon Sep 17 00:00:00 2001 From: Cory Benfield Date: Sat, 29 Jul 2017 12:12:11 +0100 Subject: [PATCH] Correctly raise SSLError from urllib3. --- requests/adapters.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/requests/adapters.py b/requests/adapters.py index 205da0cd..00f8792b 100644 --- a/requests/adapters.py +++ b/requests/adapters.py @@ -501,6 +501,10 @@ class HTTPAdapter(BaseAdapter): if isinstance(e.reason, _ProxyError): raise ProxyError(e, request=request) + if isinstance(e.reason, _SSLError): + # This branch is for urllib3 v1.22 and later. + raise SSLError(e, request=request) + raise ConnectionError(e, request=request) except ClosedPoolError as e: @@ -511,6 +515,7 @@ class HTTPAdapter(BaseAdapter): except (_SSLError, _HTTPError) as e: if isinstance(e, _SSLError): + # This branch is for urllib3 versions earlier than v1.22 raise SSLError(e, request=request) elif isinstance(e, ReadTimeoutError): raise ReadTimeout(e, request=request)