diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-18 16:17:53 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-18 16:17:53 -0500 |
| commit | d1dee0f045c8096904369270899d73ef8b6a96bf (patch) | |
| tree | 1e5abbc1456077713b0268af0914cfd857b07477 /setuptools/ssl_support.py | |
| parent | cae9a18f6df1e8acbab701e853fe076cdbae2467 (diff) | |
| parent | cf307155b6c687ea2a9f5369aca5b03007db7b8b (diff) | |
| download | python-setuptools-bitbucket-0.8b1.tar.gz | |
Merge 0.7.3 release0.8b1
Diffstat (limited to 'setuptools/ssl_support.py')
| -rw-r--r-- | setuptools/ssl_support.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py index 6dca5fab..2aec655a 100644 --- a/setuptools/ssl_support.py +++ b/setuptools/ssl_support.py @@ -1,6 +1,7 @@ -import sys, os, socket, urllib2, atexit, re +import sys, os, socket, atexit, re import pkg_resources from pkg_resources import ResolutionError, ExtractionError +from setuptools.compat import urllib2 try: import ssl |