From: Ian Cordasco <ian.cordasco@rackspace.com>
Date: Fri, 29 Aug 2014 20:16:30 +0000 (-0500)
Subject: Capture and re-raise urllib3 ProtocolError
X-Git-Tag: v2.4.1~5^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=da122231e4dab3cc3f9726b4e8edf70bb649dd5d;p=services%2Fpython-requests.git

Capture and re-raise urllib3 ProtocolError
---

diff --git a/requests/adapters.py b/requests/adapters.py
index 3c1e979..6c6597d 100644
--- a/requests/adapters.py
+++ b/requests/adapters.py
@@ -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)