kennethreitz/requests
1
0
Fork 0
mirror of https://github.com/kennethreitz/requests.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Capture and re-raise urllib3 ProtocolError

Browse Source
This commit is contained in:
Ian Cordasco
2014-08-29 15:16:30 -05:00
parent 95161ed313
commit da122231e4
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
requests/adapters.py
+4
View File
@@ -23,6 +23,7 @@ from .packages.urllib3.exceptions import ConnectTimeoutError
from .packages.urllib3.exceptions import HTTPError as _HTTPError
from .packages.urllib3.exceptions import MaxRetryError
from .packages.urllib3.exceptions import ProxyError as _ProxyError
from .packages.urllib3.exceptions import ProtocolError
from .packages.urllib3.exceptions import ReadTimeoutError
from .packages.urllib3.exceptions import SSLError as _SSLError
from .cookies import extract_cookies_to_jar
@@ -403,6 +404,9 @@ class HTTPAdapter(BaseAdapter):
except socket.error as sockerr:
raise ConnectionError(sockerr, request=request)
except ProtocolError as e:
raise ConnectionError(e, request=request)
except MaxRetryError as e:
if isinstance(e.reason, ConnectTimeoutError):
raise ConnectTimeout(e, request=request)