diff options
| author | pje <none@none> | 2013-05-31 15:30:35 -0400 |
|---|---|---|
| committer | pje <none@none> | 2013-05-31 15:30:35 -0400 |
| commit | d58f9a5feafbeb74b6205c43a4d8cc58923814de (patch) | |
| tree | 04c38b5afc686867347093ad1c45af8062d9c80a | |
| parent | 7ad02bac8fa7250a96bad6c864e82792e6427273 (diff) | |
| download | external_python_setuptools-d58f9a5feafbeb74b6205c43a4d8cc58923814de.tar.gz external_python_setuptools-d58f9a5feafbeb74b6205c43a4d8cc58923814de.tar.bz2 external_python_setuptools-d58f9a5feafbeb74b6205c43a4d8cc58923814de.zip | |
Correct missing import in ssl_support
(grafted from 3b91f246d8de2f54b4b764dfe362a3677a001162)
--HG--
branch : setuptools-0.6
extra : source : 3b91f246d8de2f54b4b764dfe362a3677a001162
| -rw-r--r-- | setuptools/ssl_support.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py index f1d8c920..2e615db3 100644 --- a/setuptools/ssl_support.py +++ b/setuptools/ssl_support.py @@ -1,5 +1,5 @@ -import sys, os, socket, urllib2, atexit, re -from pkg_resources import ResolutionError, ExtractionError +import sys, os, socket, urllib2, atexit +from pkg_resources import ResolutionError, ExtractionError, resource_filename try: import ssl @@ -236,7 +236,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 |