|
 |
df199a |
diff --git a/requests/__init__.py b/requests/__init__.py
|
|
|
df199a |
index 446500b..8257b61 100644
|
|
|
df199a |
--- a/requests/__init__.py
|
|
|
df199a |
+++ b/requests/__init__.py
|
|
|
df199a |
@@ -50,7 +50,7 @@ __copyright__ = 'Copyright 2015 Kenneth Reitz'
|
|
|
df199a |
|
|
|
df199a |
# Attempt to enable urllib3's SNI support, if possible
|
|
|
df199a |
try:
|
|
|
df199a |
- from .packages.urllib3.contrib import pyopenssl
|
|
|
df199a |
+ from urllib3.contrib import pyopenssl
|
|
|
df199a |
pyopenssl.inject_into_urllib3()
|
|
|
df199a |
except ImportError:
|
|
|
df199a |
pass
|
|
|
df199a |
diff --git a/requests/adapters.py b/requests/adapters.py
|
|
|
df199a |
index 02e0dd1..daae42e 100644
|
|
|
df199a |
--- a/requests/adapters.py
|
|
|
df199a |
+++ b/requests/adapters.py
|
|
|
df199a |
@@ -11,22 +11,22 @@ and maintain connections.
|
|
|
df199a |
import socket
|
|
|
df199a |
|
|
|
df199a |
from .models import Response
|
|
|
df199a |
-from .packages.urllib3.poolmanager import PoolManager, proxy_from_url
|
|
|
df199a |
-from .packages.urllib3.response import HTTPResponse
|
|
|
df199a |
-from .packages.urllib3.util import Timeout as TimeoutSauce
|
|
|
df199a |
-from .packages.urllib3.util.retry import Retry
|
|
|
df199a |
+from urllib3.poolmanager import PoolManager, proxy_from_url
|
|
|
df199a |
+from urllib3.response import HTTPResponse
|
|
|
df199a |
+from urllib3.util import Timeout as TimeoutSauce
|
|
|
df199a |
+from urllib3.util.retry import Retry
|
|
|
df199a |
from .compat import urlparse, basestring
|
|
|
df199a |
from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers,
|
|
|
df199a |
prepend_scheme_if_needed, get_auth_from_url, urldefragauth)
|
|
|
df199a |
from .structures import CaseInsensitiveDict
|
|
|
df199a |
-from .packages.urllib3.exceptions import ConnectTimeoutError
|
|
|
df199a |
-from .packages.urllib3.exceptions import HTTPError as _HTTPError
|
|
|
df199a |
-from .packages.urllib3.exceptions import MaxRetryError
|
|
|
df199a |
-from .packages.urllib3.exceptions import ProxyError as _ProxyError
|
|
|
df199a |
-from .packages.urllib3.exceptions import ProtocolError
|
|
|
df199a |
-from .packages.urllib3.exceptions import ReadTimeoutError
|
|
|
df199a |
-from .packages.urllib3.exceptions import SSLError as _SSLError
|
|
|
df199a |
-from .packages.urllib3.exceptions import ResponseError
|
|
|
df199a |
+from urllib3.exceptions import ConnectTimeoutError
|
|
|
df199a |
+from urllib3.exceptions import HTTPError as _HTTPError
|
|
|
df199a |
+from urllib3.exceptions import MaxRetryError
|
|
|
df199a |
+from urllib3.exceptions import ProxyError as _ProxyError
|
|
|
df199a |
+from urllib3.exceptions import ProtocolError
|
|
|
df199a |
+from urllib3.exceptions import ReadTimeoutError
|
|
|
df199a |
+from urllib3.exceptions import SSLError as _SSLError
|
|
|
df199a |
+from urllib3.exceptions import ResponseError
|
|
|
df199a |
from .cookies import extract_cookies_to_jar
|
|
|
df199a |
from .exceptions import (ConnectionError, ConnectTimeout, ReadTimeout, SSLError,
|
|
|
df199a |
ProxyError, RetryError)
|
|
|
df199a |
diff --git a/requests/compat.py b/requests/compat.py
|
|
|
df199a |
index 40bb6c5..4232288 100644
|
|
|
df199a |
--- a/requests/compat.py
|
|
|
df199a |
+++ b/requests/compat.py
|
|
|
df199a |
@@ -4,7 +4,7 @@
|
|
|
df199a |
pythoncompat
|
|
|
df199a |
"""
|
|
|
df199a |
|
|
|
df199a |
-from .packages import chardet
|
|
|
df199a |
+import chardet
|
|
|
df199a |
|
|
|
df199a |
import sys
|
|
|
df199a |
|
|
|
df199a |
diff --git a/requests/exceptions.py b/requests/exceptions.py
|
|
|
df199a |
index 89135a8..b70c525 100644
|
|
|
df199a |
--- a/requests/exceptions.py
|
|
|
df199a |
+++ b/requests/exceptions.py
|
|
|
df199a |
@@ -7,7 +7,7 @@ requests.exceptions
|
|
|
df199a |
This module contains the set of Requests' exceptions.
|
|
|
df199a |
|
|
|
df199a |
"""
|
|
|
df199a |
-from .packages.urllib3.exceptions import HTTPError as BaseHTTPError
|
|
|
df199a |
+from urllib3.exceptions import HTTPError as BaseHTTPError
|
|
|
df199a |
|
|
|
df199a |
|
|
|
df199a |
class RequestException(IOError):
|
|
|
df199a |
diff --git a/requests/models.py b/requests/models.py
|
|
|
df199a |
index 419cf0a..131b88d 100644
|
|
|
df199a |
--- a/requests/models.py
|
|
|
df199a |
+++ b/requests/models.py
|
|
|
df199a |
@@ -16,10 +16,10 @@ from .structures import CaseInsensitiveDict
|
|
|
df199a |
|
|
|
df199a |
from .auth import HTTPBasicAuth
|
|
|
df199a |
from .cookies import cookiejar_from_dict, get_cookie_header
|
|
|
df199a |
-from .packages.urllib3.fields import RequestField
|
|
|
df199a |
-from .packages.urllib3.filepost import encode_multipart_formdata
|
|
|
df199a |
-from .packages.urllib3.util import parse_url
|
|
|
df199a |
-from .packages.urllib3.exceptions import (
|
|
|
df199a |
+from urllib3.fields import RequestField
|
|
|
df199a |
+from urllib3.filepost import encode_multipart_formdata
|
|
|
df199a |
+from urllib3.util import parse_url
|
|
|
df199a |
+from urllib3.exceptions import (
|
|
|
df199a |
DecodeError, ReadTimeoutError, ProtocolError, LocationParseError)
|
|
|
df199a |
from .exceptions import (
|
|
|
df199a |
HTTPError, MissingSchema, InvalidURL, ChunkedEncodingError,
|
|
|
df199a |
diff --git a/requests/sessions.py b/requests/sessions.py
|
|
|
df199a |
index 9a51f33..22bd226 100644
|
|
|
df199a |
--- a/requests/sessions.py
|
|
|
df199a |
+++ b/requests/sessions.py
|
|
|
df199a |
@@ -21,7 +21,7 @@ from .hooks import default_hooks, dispatch_hook
|
|
|
df199a |
from .utils import to_key_val_list, default_headers, to_native_string, DEFAULT_PORTS
|
|
|
df199a |
from .exceptions import (
|
|
|
df199a |
TooManyRedirects, InvalidSchema, ChunkedEncodingError, ContentDecodingError)
|
|
|
df199a |
-from .packages.urllib3._collections import RecentlyUsedContainer
|
|
|
df199a |
+from urllib3._collections import RecentlyUsedContainer
|
|
|
df199a |
from .structures import CaseInsensitiveDict
|
|
|
df199a |
|
|
|
df199a |
from .adapters import HTTPAdapter
|