Changed ConnectionError to InvalidURL

diff --git a/requests/models.py b/requests/models.py
index b95b5bebde33f216b409f843f090980ec830d3a6..8a71e28babb15620521d248a9672bebc46fee27c 100644 (file)
--- a/requests/models.py
+++ b/requests/models.py
@@ -354,7 +354,7 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
         try:
             scheme, auth, host, port, path, query, fragment = parse_url(url)
         except LocationParseError as e:
-            raise ConnectionError(e.message)
+            raise InvalidURL(e.message)
 
         if not scheme:
             raise MissingSchema("Invalid URL {0!r}: No schema supplied. "

diff --git a/test_requests.py b/test_requests.py
index 6e49f0270c31bd8fc8350d378a466c231c5503ed..d176ef45adb39d9249e8327e4e45f3b0b4727749 100755 (executable)
--- a/test_requests.py
+++ b/test_requests.py
@@ -310,8 +310,8 @@ class RequestsTestCase(unittest.TestCase):
             requests.get("http://httpbin.org:1")
 
     def test_LocationParseError(self):
-        """Inputing a URL that cannot be parsed should raise a ConnectionError"""
-        with pytest.raises(ConnectionError):
+        """Inputing a URL that cannot be parsed should raise an InvalidURL error"""
+        with pytest.raises(InvalidURL):
             requests.get("http://fe80::5054:ff:fe5a:fc0")
 
     def test_basicauth_with_netrc(self):