diff --git a/requests/models.py b/requests/models.py index 3dac61a4..b1ec9ca7 100644 --- a/requests/models.py +++ b/requests/models.py @@ -351,7 +351,7 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin): error = ("Invalid URL {0!r}: No scheme supplied. Perhaps you meant http://{0}?") error = error.format(to_native_string(url, 'utf8')) - raise MissingSchema(error) + raise MissingScheme(error) if not host: raise InvalidURL("Invalid URL %r: No host supplied" % url) diff --git a/test_requests.py b/test_requests.py index 8ecdb52b..b3a8cde3 100755 --- a/test_requests.py +++ b/test_requests.py @@ -23,7 +23,7 @@ from requests.compat import ( from requests.cookies import cookiejar_from_dict, morsel_to_cookie from requests.exceptions import (ConnectionError, ConnectTimeout, InvalidScheme, InvalidURL, MissingScheme, - ReadTimeout, Timeout, RetryError) + ReadTimeout, Timeout, RetryError, TooManyRedirects) from requests.models import PreparedRequest from requests.structures import CaseInsensitiveDict from requests.sessions import SessionRedirectMixin @@ -166,8 +166,7 @@ class TestRequests(object): s = requests.Session() s.proxies = getproxies() parts = urlparse(httpbin('get')) - schemes = ['http://', 'HTTP://', 'hTTp://', 'HttP://', - 'https://', 'HTTPS://', 'hTTps://', 'HttPs://'] + schemes = ['http://', 'HTTP://', 'hTTp://', 'HttP://'] for scheme in schemes: url = scheme + parts.netloc + parts.path r = requests.Request('GET', url)