diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-18 15:01:44 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-18 15:01:44 -0500 |
| commit | b0abfb1c076baced9bf182a357dd47e9482bf065 (patch) | |
| tree | 55a30c8bdd916583a818895c0b660f73815202d0 /setuptools/ssl_support.py | |
| parent | c04abca662dcbffd00d928e06fbf32b9f49f8e57 (diff) | |
| parent | 3c86c861ab9665df0e502f250a7471d09240e413 (diff) | |
| download | external_python_setuptools-b0abfb1c076baced9bf182a357dd47e9482bf065.tar.gz external_python_setuptools-b0abfb1c076baced9bf182a357dd47e9482bf065.tar.bz2 external_python_setuptools-b0abfb1c076baced9bf182a357dd47e9482bf065.zip | |
Merge Python 3 native support from distribute
--HG--
rename : tests/test_distribute_setup.py => tests/test_ez_setup.py
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 |