From 6ea8cd990e8c589ea19058229223574af904bab4ea4c4a78a6cd794b2048e23e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 21 Oct 2015 20:51:25 +0000 Subject: [PATCH] - remove requests-do-not-use-bundle.patch (bsc#947357) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests?expand=0&rev=79 --- python-requests.changes | 5 ++ python-requests.spec | 3 - requests-do-not-use-bundle.patch | 111 ------------------------------- 3 files changed, 5 insertions(+), 114 deletions(-) delete mode 100644 requests-do-not-use-bundle.patch diff --git a/python-requests.changes b/python-requests.changes index 1b1ab07..3e0979d 100644 --- a/python-requests.changes +++ b/python-requests.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 21 20:49:30 UTC 2015 - dmueller@suse.com + +- remove requests-do-not-use-bundle.patch (bsc#947357) + ------------------------------------------------------------------- Wed Oct 21 08:00:52 UTC 2015 - dmueller@suse.com diff --git a/python-requests.spec b/python-requests.spec index e5e33ee..9d7b75a 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -26,8 +26,6 @@ Url: http://python-requests.org Source: http://pypi.python.org/packages/source/r/requests/requests-%{version}.tar.gz # PATCH-FIX-OPENSUSE no-default-cacert.patch -- completely ignore the internal CA bundle Patch0: no-default-cacert.patch -# PATCH-FIX-OPENSUSE requests-do-not-use-bundle.patch --use system libraries instead of bundled ones -Patch1: requests-do-not-use-bundle.patch BuildRequires: python BuildRequires: python-devel BuildRequires: python-py @@ -72,7 +70,6 @@ Features: # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' ./requests/certs.py %patch0 -p1 -%patch1 -p1 rm ./requests/cacert.pem %build diff --git a/requests-do-not-use-bundle.patch b/requests-do-not-use-bundle.patch deleted file mode 100644 index fb5c5ed..0000000 --- a/requests-do-not-use-bundle.patch +++ /dev/null @@ -1,111 +0,0 @@ ---- 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