summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Cordasco <ian.cordasco@rackspace.com>2014-09-03 16:01:25 -0500
committerIan Cordasco <ian.cordasco@rackspace.com>2014-09-03 16:01:25 -0500
commit9354855648cedbec3a91a9391e067f56e8414814 (patch)
tree0b88c07f0a4b17c654f77323153262bcdd90fcde
parentce7957c085d912bd1b225460d159b19eaf3e6510 (diff)
downloadpython-requests-9354855648cedbec3a91a9391e067f56e8414814.tar.gz
Consolidate error handling
-rw-r--r--requests/adapters.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/requests/adapters.py b/requests/adapters.py
index 6c6597da..bf94bbe7 100644
--- a/requests/adapters.py
+++ b/requests/adapters.py
@@ -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):