diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-10-14 16:11:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-14 16:11:33 -0400 |
| commit | c69005949c3e875534cf1b1c662b09bb2aec4f73 (patch) | |
| tree | 426a19428d78f03bbded5c7242ebe0a6700cecd3 | |
| parent | f1cf491f360110af0b580758418c1a8ae7ae658b (diff) | |
| parent | 7576d32d009142030ae64a867d407c536bad9752 (diff) | |
| download | external_python_setuptools-c69005949c3e875534cf1b1c662b09bb2aec4f73.tar.gz external_python_setuptools-c69005949c3e875534cf1b1c662b09bb2aec4f73.tar.bz2 external_python_setuptools-c69005949c3e875534cf1b1c662b09bb2aec4f73.zip | |
Merge pull request #762 from matejcik/master
improve certificate handling in SUSE Linux
| -rw-r--r-- | setuptools/ssl_support.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py index f4ba8a92..16272630 100644 --- a/setuptools/ssl_support.py +++ b/setuptools/ssl_support.py @@ -26,6 +26,7 @@ cert_paths = """ /etc/ssl/cert.pem /System/Library/OpenSSL/certs/cert.pem /usr/local/share/certs/ca-root-nss.crt +/etc/ssl/ca-bundle.pem """.strip().split() @@ -242,6 +243,7 @@ def find_ca_bundle(): if os.path.isfile(cert_path): return cert_path try: - return pkg_resources.resource_filename('certifi', 'cacert.pem') + import certifi + return certifi.where() except (ImportError, ResolutionError, ExtractionError): return None |