diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2013-06-19 11:45:38 +0100 |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2013-06-19 11:45:38 +0100 |
| commit | 8d016844c5934fe8f7ee4c559ab5a1f2133fa6dc (patch) | |
| tree | 199a8e4792f87c951fcf82197061c35e5805d100 /setuptools/ssl_support.py | |
| parent | 744a61f18bbfcbf7dfaa08886185b4595d8b7bcb (diff) | |
| parent | 5d9d3930f400a754f38be2a4de21a7f9ed00f5f4 (diff) | |
| download | external_python_setuptools-8d016844c5934fe8f7ee4c559ab5a1f2133fa6dc.tar.gz external_python_setuptools-8d016844c5934fe8f7ee4c559ab5a1f2133fa6dc.tar.bz2 external_python_setuptools-8d016844c5934fe8f7ee4c559ab5a1f2133fa6dc.zip | |
Merged upstream changes.
--HG--
branch : single-codebase
Diffstat (limited to 'setuptools/ssl_support.py')
| -rw-r--r-- | setuptools/ssl_support.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py index af718a4b..e749b312 100644 --- a/setuptools/ssl_support.py +++ b/setuptools/ssl_support.py @@ -1,6 +1,7 @@ import sys, os, socket, atexit, re import pkg_resources from pkg_resources import ResolutionError, ExtractionError +from setuptools.compat import urllib2 try: import urllib2 |