forked from pool/python-requests
Accepting request 360051 from home:XRevan86
OBS-URL: https://build.opensuse.org/request/show/360051 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests?expand=0&rev=85
This commit is contained in:
committed by
Git OBS Bridge
parent
60197780b7
commit
ee0d6bcb47
@@ -5,7 +5,7 @@
|
||||
+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):
|
||||
@@ -182,9 +182,6 @@ class HTTPAdapter(BaseAdapter):
|
||||
if not cert_loc:
|
||||
cert_loc = DEFAULT_CA_BUNDLE_PATH
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
- raise Exception("Could not find a suitable SSL CA certificate bundle.")
|
||||
-
|
||||
conn.cert_reqs = 'CERT_REQUIRED'
|
||||
conn.ca_certs = cert_loc
|
||||
else:
|
||||
|
||||
if not os.path.isdir(cert_loc):
|
||||
--- a/requests/certs.py
|
||||
+++ b/requests/certs.py
|
||||
@@ -18,8 +18,9 @@ try:
|
||||
@@ -23,9 +23,9 @@
|
||||
"""Return the preferred certificate bundle."""
|
||||
- # vendored bundle inside Requests
|
||||
- return os.path.join(os.path.dirname(__file__), 'cacert.pem')
|
||||
+ # in openSUSE we rely on openssl's default instead of
|
||||
+ # hardcoding stuff elsewhere
|
||||
+ return None
|
||||
+ # in openSUSE we rely on ca-certificates instead of
|
||||
+ # having an another bundle
|
||||
+ return '/etc/ssl/ca-bundle.pem'
|
||||
|
||||
if __name__ == '__main__':
|
||||
print(where())
|
||||
|
Reference in New Issue
Block a user