[Python-checkins] r88999 - sandbox/trunk/setuptools/setuptools/ssl_support.py

Fri May 31 21:32:43 CEST 2013

Author: phillip.eby
Date: Fri May 31 21:32:43 2013
New Revision: 88999
Log:
Fix missing import
Modified:
 sandbox/trunk/setuptools/setuptools/ssl_support.py
Modified: sandbox/trunk/setuptools/setuptools/ssl_support.py
==============================================================================

--- sandbox/trunk/setuptools/setuptools/ssl_support.py	(original)
+++ sandbox/trunk/setuptools/setuptools/ssl_support.py	Fri May 31 21:32:43 2013
@@ -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 @@
 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
 
