pool/python-requests
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 339102 from home:XRevan86

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/339102
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests?expand=0&rev=75
This commit is contained in:
Todd R 2015-10-15 12:02:24 +00:00 committed by Git OBS Bridge
parent e41975ba9d
commit ce9d5664e0
3 changed files with 9 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
no-default-cacert-sles.patch
View File

@ -1,34 +0,0 @@
Index: requests-1.1.0/MANIFEST.in
===================================================================
--- requests-1.1.0.orig/MANIFEST.in
+++ requests-1.1.0/MANIFEST.in
@@ -1 +1 @@
-include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt requests/cacert.pem
+include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt
Index: requests-1.1.0/requests/adapters.py
===================================================================
--- requests-1.1.0.orig/requests/adapters.py
+++ requests-1.1.0/requests/adapters.py
@@ -132,9 +132,6 @@ class HTTPAdapter(BaseAdapter):
if not cert_loc:
cert_loc = DEFAULT_CA_BUNDLE_PATH
- if not cert_loc:
- raise Exception("Could not find a suitable SSL CA certificate bundle.")
-
conn.cert_reqs = 'CERT_REQUIRED'
conn.ca_certs = cert_loc
else:
Index: requests-1.1.0/requests/certs.py
===================================================================
--- requests-1.1.0.orig/requests/certs.py
+++ requests-1.1.0/requests/certs.py
@@ -19,7 +19,7 @@
def where():
"""Return the preferred certificate bundle."""
# vendored bundle inside Requests
- return os.path.join(os.path.dirname(__file__), 'cacert.pem')
+ return None
if __name__ == '__main__':
print(where())

7
python-requests.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Oct 14 19:24:43 UTC 2015 - sor.alexei@meowr.ru
- Add python3-chardet to build requirements for tests.
- Remove no-default-cacert-sles.patch as no-default-cacert.patch
does basically the same.
-------------------------------------------------------------------
Fri Oct 9 19:11:09 UTC 2015 - sor.alexei@meowr.ru

10
python-requests.spec
View File

@ -26,10 +26,8 @@ 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-SLE no-default-cacert-sles.patch -- completely ignore the internal CA bundle (SLES version)
Patch1: no-default-cacert-sles.patch
# PATCH-FIX-OPENSUSE requests-do-not-use-bundle.patch --use system libraries instead of bundled ones
Patch2: requests-do-not-use-bundle.patch
Patch1: requests-do-not-use-bundle.patch
BuildRequires: python
BuildRequires: python-devel
BuildRequires: python-py
@ -72,12 +70,8 @@ Features:
%setup -q -n requests-%{version}
# For rpmlint warning: remove shebang from python library:
sed -i '/^#!/d' ./requests/certs.py
%if 0%{?suse_version} == 1110 || (0%{?suse_version} == 1315 && !0%{?is_opensuse})
%patch1 -p1
%else
%patch0 -p1
%endif
%patch2 -p1
%patch1 -p1
rm ./requests/cacert.pem
%build