python/python-requests
SHA256
14
0
Fork 0
forked from pool/python-requests
Code Pull Requests Activity

Accepting request 339109 from devel:languages:python

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/339109
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-requests?expand=0&rev=28
This commit is contained in:
Dominique Leuenberger
2015-10-19 20:51:36 +00:00
committed by Git OBS Bridge
parent 7ea6aee370
commit 04b18d7493
7 changed files with 215 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
no-default-cacert.patch
View File

@@ -1,8 +1,11 @@
Index: requests-2.6.0/requests/adapters.py
===================================================================
--- requests-2.6.0.orig/requests/adapters.py
+++ requests-2.6.0/requests/adapters.py
@@ -177,9 +177,6 @@ class HTTPAdapter(BaseAdapter):
--- a/MANIFEST.in
+++ b/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
--- a/requests/adapters.py
+++ b/requests/adapters.py
@@ -180,9 +180,6 @@ class HTTPAdapter(BaseAdapter):
if not cert_loc:
cert_loc = DEFAULT_CA_BUNDLE_PATH
@@ -12,10 +15,8 @@ Index: requests-2.6.0/requests/adapters.py
conn.cert_reqs = 'CERT_REQUIRED'
conn.ca_certs = cert_loc
else:
Index: requests-2.6.0/requests/certs.py
===================================================================
--- requests-2.6.0.orig/requests/certs.py
+++ requests-2.6.0/requests/certs.py
--- a/requests/certs.py
+++ b/requests/certs.py
@@ -18,8 +18,9 @@ try:
except ImportError:
def where():
@@ -28,24 +29,14 @@ Index: requests-2.6.0/requests/certs.py
if __name__ == '__main__':
print(where())
Index: requests-2.6.0/MANIFEST.in
===================================================================
--- requests-2.6.0.orig/MANIFEST.in
+++ requests-2.6.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-2.6.0/requests/packages/urllib3/util/ssl_.py
===================================================================
--- requests-2.6.0.orig/requests/packages/urllib3/util/ssl_.py
+++ requests-2.6.0/requests/packages/urllib3/util/ssl_.py
@@ -259,6 +259,9 @@ def ssl_wrap_socket(sock, keyfile=None,
--- a/requests/packages/urllib3/util/ssl_.py
+++ b/requests/packages/urllib3/util/ssl_.py
@@ -278,6 +278,8 @@ def ssl_wrap_socket(sock, keyfile=None,
if e.errno == errno.ENOENT:
raise SSLError(e)
raise
+ elif cert_reqs != CERT_NONE:
+ context.set_default_verify_paths()
+
if certfile:
context.load_cert_chain(certfile, keyfile)
if HAS_SNI: # Platform-specific: OpenSSL with enabled SNI