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 | 7180fc2285758afb08dce2f31289fed0b9725a05 (patch) | |
| tree | a834938f1096c3f0e6ef48df2df058887558bf51 /setuptools | |
| parent | 524a92343de6039277875639aa074a46528479d4 (diff) | |
| parent | 422e49241c23b1be47c71d6372b05b70fc801bce (diff) | |
| download | python-setuptools-bitbucket-7180fc2285758afb08dce2f31289fed0b9725a05.tar.gz | |
Merge pull request #3 from abadger/feature/socket-exception-import
Import socket.error so the code throws the correct exception
Diffstat (limited to 'setuptools')
| -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): |