diff options
author | Daniele Tricoli <eriol@mornie.org> | 2015-10-14 19:05:05 +0200 |
---|---|---|
committer | Daniele Tricoli <eriol@mornie.org> | 2015-10-14 19:05:05 +0200 |
commit | d01fda0eb2b8256cc36b77bb586ba6bc7c58c561 (patch) | |
tree | 9388f02824df07bcbe014f6fe801a0b1b23d6c07 /requests/packages/urllib3/poolmanager.py | |
parent | 4ded421c898253557a3bb0147a2bfc8c85583db8 (diff) | |
parent | 3d3afa49b9ca0e898ecb09c7271d28e0c737016b (diff) | |
download | python-requests-d01fda0eb2b8256cc36b77bb586ba6bc7c58c561.tar python-requests-d01fda0eb2b8256cc36b77bb586ba6bc7c58c561.tar.gz |
merge patched into master
Diffstat (limited to 'requests/packages/urllib3/poolmanager.py')
-rw-r--r-- | requests/packages/urllib3/poolmanager.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/requests/packages/urllib3/poolmanager.py b/requests/packages/urllib3/poolmanager.py index b8d1e74..76b6a12 100644 --- a/requests/packages/urllib3/poolmanager.py +++ b/requests/packages/urllib3/poolmanager.py @@ -8,7 +8,7 @@ except ImportError: from ._collections import RecentlyUsedContainer from .connectionpool import HTTPConnectionPool, HTTPSConnectionPool from .connectionpool import port_by_scheme -from .exceptions import LocationValueError, MaxRetryError +from .exceptions import LocationValueError, MaxRetryError, ProxySchemeUnknown from .request import RequestMethods from .util.url import parse_url from .util.retry import Retry @@ -227,8 +227,8 @@ class ProxyManager(PoolManager): port = port_by_scheme.get(proxy.scheme, 80) proxy = proxy._replace(port=port) - assert proxy.scheme in ("http", "https"), \ - 'Not supported proxy scheme %s' % proxy.scheme + if proxy.scheme not in ("http", "https"): + raise ProxySchemeUnknown(proxy.scheme) self.proxy = proxy self.proxy_headers = proxy_headers or {} |