diff options
| author | Kenneth Reitz <me@kennethreitz.org> | 2017-05-26 22:52:29 -0400 |
|---|---|---|
| committer | Kenneth Reitz <me@kennethreitz.org> | 2017-05-26 22:52:29 -0400 |
| commit | 168109f13c135d719a0be21ce220534e4b657aed (patch) | |
| tree | bbd000d4bc068d6dd2db665c4a1cef2176fcdf9e | |
| parent | 8a2014e265d6c8036eb35958b22bf8bd4e2a2c9e (diff) | |
| download | python-requests-168109f13c135d719a0be21ce220534e4b657aed.tar.gz | |
fix adapters.py
| -rw-r--r-- | requests/adapters.py | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/requests/adapters.py b/requests/adapters.py index 0d461b35..420e3a52 100644 --- a/requests/adapters.py +++ b/requests/adapters.py @@ -11,26 +11,27 @@ and maintain connections. import os.path import socket +from urllib3.poolmanager import PoolManager, proxy_from_url +from urllib3.response import HTTPResponse +from urllib3.util import Timeout as TimeoutSauce +from urllib3.util.retry import Retry +from urllib3.exceptions import ClosedPoolError +from urllib3.exceptions import ConnectTimeoutError +from urllib3.exceptions import HTTPError as _HTTPError +from urllib3.exceptions import MaxRetryError +from urllib3.exceptions import NewConnectionError +from urllib3.exceptions import ProxyError as _ProxyError +from urllib3.exceptions import ProtocolError +from urllib3.exceptions import ReadTimeoutError +from urllib3.exceptions import SSLError as _SSLError +from urllib3.exceptions import ResponseError + from .models import Response -from .packages.urllib3.poolmanager import PoolManager, proxy_from_url -from .packages.urllib3.response import HTTPResponse -from .packages.urllib3.util import Timeout as TimeoutSauce -from .packages.urllib3.util.retry import Retry from .compat import urlparse, basestring from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers, prepend_scheme_if_needed, get_auth_from_url, urldefragauth, select_proxy) from .structures import CaseInsensitiveDict -from .packages.urllib3.exceptions import ClosedPoolError -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 NewConnectionError -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 .packages.urllib3.exceptions import ResponseError from .cookies import extract_cookies_to_jar from .exceptions import (ConnectionError, ConnectTimeout, ReadTimeout, SSLError, ProxyError, RetryError, InvalidSchema) |