aboutsummaryrefslogtreecommitdiff
path: root/requests/packages/urllib3/poolmanager.py
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-10-14 19:04:18 +0200
committerDaniele Tricoli <eriol@mornie.org>2015-10-14 19:04:18 +0200
commitcb40ec082506c0d9eb05978839bed2f12541af35 (patch)
tree0fe8938e38767200c05ba3e8071bfe6777f75a3e /requests/packages/urllib3/poolmanager.py
parentb4a5af4fcbf4e5d0f741aaf9978c728235b11a56 (diff)
downloadpython-requests-cb40ec082506c0d9eb05978839bed2f12541af35.tar
python-requests-cb40ec082506c0d9eb05978839bed2f12541af35.tar.gz
Import requests_2.8.1.orig.tar.gz
Diffstat (limited to 'requests/packages/urllib3/poolmanager.py')
-rw-r--r--requests/packages/urllib3/poolmanager.py6
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 {}