From d58f9a5feafbeb74b6205c43a4d8cc58923814de Mon Sep 17 00:00:00 2001 From: pje Date: Fri, 31 May 2013 15:30:35 -0400 Subject: Correct missing import in ssl_support (grafted from 3b91f246d8de2f54b4b764dfe362a3677a001162) --HG-- branch : setuptools-0.6 extra : source : 3b91f246d8de2f54b4b764dfe362a3677a001162 --- setuptools/ssl_support.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'setuptools') 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 -- cgit v1.2.3