2015-10-19 20:51:36 +00:00
|
|
|
--- 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
|
2016-02-25 21:08:19 +00:00
|
|
|
@@ -182,9 +182,6 @@ class HTTPAdapter(BaseAdapter):
|
2013-07-25 18:31:16 +00:00
|
|
|
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'
|
2016-02-25 21:08:19 +00:00
|
|
|
|
|
|
|
if not os.path.isdir(cert_loc):
|
2015-10-19 20:51:36 +00:00
|
|
|
--- a/requests/certs.py
|
|
|
|
+++ b/requests/certs.py
|
2015-07-14 15:43:46 +00:00
|
|
|
@@ -18,8 +18,9 @@ try:
|
|
|
|
except ImportError:
|
2014-09-12 08:03:33 +00:00
|
|
|
def where():
|
|
|
|
"""Return the preferred certificate bundle."""
|
2015-07-14 15:43:46 +00:00
|
|
|
- # vendored bundle inside Requests
|
2014-09-12 08:03:33 +00:00
|
|
|
- return os.path.join(os.path.dirname(__file__), 'cacert.pem')
|
2016-02-25 21:08:19 +00:00
|
|
|
+ # in openSUSE we rely on ca-certificates instead of
|
|
|
|
+ # having an another bundle
|
|
|
|
+ return '/etc/ssl/ca-bundle.pem'
|
2013-07-25 18:31:16 +00:00
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
|
|
print(where())
|