53b6e29688
OBS-URL: https://build.opensuse.org/request/show/336575 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests?expand=0&rev=71
100 lines
4.1 KiB
Diff
100 lines
4.1 KiB
Diff
--- a/requests/adapters.py 2015-03-14 09:23:40.000000000 +0100
|
|
+++ b/requests/adapters.py 2015-09-28 14:45:56.745440792 +0200
|
|
@@ -11,22 +11,22 @@
|
|
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)
|
|
from .structures import CaseInsensitiveDict
|
|
-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 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 2015-02-24 08:46:40.000000000 +0100
|
|
+++ b/requests/compat.py 2015-09-28 14:46:38.358682814 +0200
|
|
@@ -4,8 +4,7 @@
|
|
pythoncompat
|
|
"""
|
|
|
|
-from .packages import chardet
|
|
-
|
|
+import chardet
|
|
import sys
|
|
|
|
# -------
|
|
--- a/requests/exceptions.py 2015-02-24 08:46:40.000000000 +0100
|
|
+++ b/requests/exceptions.py 2015-09-28 14:47:59.699270143 +0200
|
|
@@ -7,7 +7,7 @@
|
|
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 2015-05-03 17:00:37.000000000 +0200
|
|
+++ b/requests/__init__.py 2015-09-28 14:48:55.561942516 +0200
|
|
@@ -50,7 +50,7 @@
|
|
|
|
# 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 2015-04-23 08:22:47.000000000 +0200
|
|
+++ b/requests/models.py 2015-09-28 14:49:35.242296252 +0200
|
|
@@ -16,10 +16,10 @@
|
|
|
|
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 2015-04-23 08:22:47.000000000 +0200
|
|
+++ b/requests/sessions.py 2015-09-28 14:50:19.381471320 +0200
|
|
@@ -21,7 +21,7 @@
|
|
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
|