From 676f75fdf714fc1207635b2d10e4e6c921a26d23 Mon Sep 17 00:00:00 2001 From: "phillip.eby" Date: Fri, 31 May 2013 19:32:43 +0000 Subject: Fix missing import git-svn-id: http://svn.python.org/projects/sandbox/trunk/setuptools@88999 6015fed2-1504-0410-9fe1-9d1591cc4771 --- setuptools/ssl_support.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py index f1d8c92..2e615db 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.1