Merge with setuptools-0.6

1e636d05 · Jason R. Coombs · b09c79d8 · d58f9a5f · 1e636d05
Commit 1e636d05 authored Jun 01, 2013 by Jason R. Coombs
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

setuptools/ssl_support.py setuptools/ssl_support.py +1 -1

No files found.
--- 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