diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-11-03 08:33:58 -0800 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-11-03 08:33:58 -0800 |
| commit | 387324c36a298bc91dd100ca2243c86e1a3e6ef0 (patch) | |
| tree | 230aa7c19fa902979ba9a91bd2855791558c973e /setuptools/ssl_support.py | |
| parent | e30f30948f572ee32229103a2f2438766a98e040 (diff) | |
| parent | 78a4d637f1db446d06f68929d76e76acd7121628 (diff) | |
| download | external_python_setuptools-387324c36a298bc91dd100ca2243c86e1a3e6ef0.tar.gz external_python_setuptools-387324c36a298bc91dd100ca2243c86e1a3e6ef0.tar.bz2 external_python_setuptools-387324c36a298bc91dd100ca2243c86e1a3e6ef0.zip | |
Merge pull request #3 from abadger/feature/socket-exception-import
Import socket.error so the code throws the correct exception
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 e1cf8040..346188f2 100644 --- a/setuptools/ssl_support.py +++ b/setuptools/ssl_support.py @@ -44,6 +44,7 @@ is_available = ssl is not None and object not in (HTTPSHandler, HTTPSConnection) try: from socket import create_connection except ImportError: + from socket import error _GLOBAL_DEFAULT_TIMEOUT = getattr(socket, '_GLOBAL_DEFAULT_TIMEOUT', object()) def create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT, source_address=None): |