Consolidate error handling

diff --git a/requests/adapters.py b/requests/adapters.py
index 6c6597da411c8c16c4670f548b1afc8d17673d8f..bf94bbe7bdb5ebe063e91808ae3fc38b312d875a 100644 (file)
--- 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):