e41975ba9d
- Update to 2.8.0. OBS-URL: https://build.opensuse.org/request/show/337534 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests?expand=0&rev=74
112 lines
4.3 KiB
Diff
112 lines
4.3 KiB
Diff
--- a/requests/adapters.py
|
|
+++ b/requests/adapters.py
|
|
@@ -11,24 +11,24 @@ and maintain connections.
|
|
import socket
|
|
|
|
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 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 .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 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 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 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 .cookies import extract_cookies_to_jar
|
|
from .exceptions import (ConnectionError, ConnectTimeout, ReadTimeout, SSLError,
|
|
ProxyError, RetryError)
|
|
--- a/requests/compat.py
|
|
+++ b/requests/compat.py
|
|
@@ -4,8 +4,7 @@
|
|
pythoncompat
|
|
"""
|
|
|
|
-from .packages import chardet
|
|
-
|
|
+import chardet
|
|
import sys
|
|
|
|
# -------
|
|
@@ -39,7 +38,7 @@ if is_py2:
|
|
import cookielib
|
|
from Cookie import Morsel
|
|
from StringIO import StringIO
|
|
- from .packages.urllib3.packages.ordered_dict import OrderedDict
|
|
+ from urllib3.packages.ordered_dict import OrderedDict
|
|
|
|
builtin_str = str
|
|
bytes = str
|
|
--- a/requests/exceptions.py
|
|
+++ b/requests/exceptions.py
|
|
@@ -7,7 +7,7 @@ requests.exceptions
|
|
This module contains the set of Requests' exceptions.
|
|
|
|
"""
|
|
-from .packages.urllib3.exceptions import HTTPError as BaseHTTPError
|
|
+from urllib3.exceptions import HTTPError as BaseHTTPError
|
|
|
|
|
|
class RequestException(IOError):
|
|
--- a/requests/__init__.py
|
|
+++ b/requests/__init__.py
|
|
@@ -50,7 +50,7 @@ __copyright__ = 'Copyright 2015 Kenneth
|
|
|
|
# Attempt to enable urllib3's SNI support, if possible
|
|
try:
|
|
- from .packages.urllib3.contrib import pyopenssl
|
|
+ from urllib3.contrib import pyopenssl
|
|
pyopenssl.inject_into_urllib3()
|
|
except ImportError:
|
|
pass
|
|
--- a/requests/models.py
|
|
+++ b/requests/models.py
|
|
@@ -16,10 +16,10 @@ from .structures import CaseInsensitiveD
|
|
|
|
from .auth import HTTPBasicAuth
|
|
from .cookies import cookiejar_from_dict, get_cookie_header, _copy_cookie_jar
|
|
-from .packages.urllib3.fields import RequestField
|
|
-from .packages.urllib3.filepost import encode_multipart_formdata
|
|
-from .packages.urllib3.util import parse_url
|
|
-from .packages.urllib3.exceptions import (
|
|
+from urllib3.fields import RequestField
|
|
+from urllib3.filepost import encode_multipart_formdata
|
|
+from urllib3.util import parse_url
|
|
+from urllib3.exceptions import (
|
|
DecodeError, ReadTimeoutError, ProtocolError, LocationParseError)
|
|
from .exceptions import (
|
|
HTTPError, MissingSchema, InvalidURL, ChunkedEncodingError,
|
|
--- a/requests/sessions.py
|
|
+++ b/requests/sessions.py
|
|
@@ -21,7 +21,7 @@ from .hooks import default_hooks, dispat
|
|
from .utils import to_key_val_list, default_headers, to_native_string
|
|
from .exceptions import (
|
|
TooManyRedirects, InvalidSchema, ChunkedEncodingError, ContentDecodingError)
|
|
-from .packages.urllib3._collections import RecentlyUsedContainer
|
|
+from urllib3._collections import RecentlyUsedContainer
|
|
from .structures import CaseInsensitiveDict
|
|
|
|
from .adapters import HTTPAdapter
|