Consolidate error handling

This commit is contained in:
Ian Cordasco
2014-09-03 16:01:25 -05:00
parent ce7957c085
commit 9354855648
+2 -5
View File
@@ -401,11 +401,8 @@ class HTTPAdapter(BaseAdapter):
# All is well, return the connection to the pool.
conn._put_conn(low_conn)
except socket.error as sockerr:
raise ConnectionError(sockerr, request=request)
except ProtocolError as e:
raise ConnectionError(e, request=request)
except (ProtocolError, socket.error) as err:
raise ConnectionError(err, request=request)
except MaxRetryError as e:
if isinstance(e.reason, ConnectTimeoutError):