diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-01 17:24:39 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-01 17:24:39 -0400 |
| commit | 1e636d05e07b345b988f9059df1c802bb905c6ba (patch) | |
| tree | e93090261fa8aa0fbee3ec63212485d843ee559c /setuptools/ssl_support.py | |
| parent | b09c79d8508e13407dc7c6c93ae0239d5ab4fc23 (diff) | |
| parent | d58f9a5feafbeb74b6205c43a4d8cc58923814de (diff) | |
| download | external_python_setuptools-1e636d05e07b345b988f9059df1c802bb905c6ba.tar.gz external_python_setuptools-1e636d05e07b345b988f9059df1c802bb905c6ba.tar.bz2 external_python_setuptools-1e636d05e07b345b988f9059df1c802bb905c6ba.zip | |
Merge with setuptools-0.6
Diffstat (limited to 'setuptools/ssl_support.py')
| -rw-r--r-- | setuptools/ssl_support.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py index 6dca5fab..32c8ee3c 100644 --- a/setuptools/ssl_support.py +++ b/setuptools/ssl_support.py @@ -237,7 +237,7 @@ def find_ca_bundle(): if os.path.isfile(cert_path): return cert_path try: - return pkg_resources.resource_filename('certifi', 'cacert.pem') + return resource_filename('certifi', 'cacert.pem') except (ImportError, ResolutionError, ExtractionError): return None |