aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools
diff options
context:
space:
mode:
authorToshio Kuratomi <toshio@fedoraproject.org>2013-10-28 10:54:34 -0700
committerToshio Kuratomi <toshio@fedoraproject.org>2013-10-28 10:54:34 -0700
commit78a4d637f1db446d06f68929d76e76acd7121628 (patch)
tree56d46ceb9e5a0bd877bc3e8b44e5badbaa8377f4 /setuptools
parentbae650322899670688e66ff7167cbf1ab34d8dd0 (diff)
downloadexternal_python_setuptools-78a4d637f1db446d06f68929d76e76acd7121628.tar.gz
external_python_setuptools-78a4d637f1db446d06f68929d76e76acd7121628.tar.bz2
external_python_setuptools-78a4d637f1db446d06f68929d76e76acd7121628.zip
Import socket.error so the code throws the correct exception
Diffstat (limited to 'setuptools')
-rw-r--r--setuptools/ssl_support.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 2aec655a..479b0d2f 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):