Introduced a socket timeout of 15 seconds on url openings fixes #48

--HG--
branch : distribute
extra : rebase_source : d4e3831771aa049e71d64f22e315352fa8906dd1

2 files changed, 16 insertions, 1 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 11498ab4..14ce6734 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,7 +7,7 @@ CHANGES
 ------
 
 * Found another case of SandboxViolation - fixed
-
+* Issue 48: Introduced a socket timeout of 15 seconds on url openings
 
 ------
 0.6.10
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index ee980214..924c15e1 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -25,6 +25,8 @@ __all__ = [
     'interpret_distro_name',
 ]
 
+_SOCKET_TIMEOUT = 15
+
 def parse_bdist_wininst(name):
     """Return (base,pyversion) or (None,None) for possible .exe name"""
 
@@ -717,6 +719,17 @@ def htmldecode(text):
 
 
 
+def socket_timeout(timeout=15):
+    def _socket_timeout(func):
+        def _socket_timeout(*args, **kwargs):
+            old_timeout = socket.getdefaulttimeout()
+            socket.setdefaulttimeout(timeout)
+            try:
+                return func(*args, **kwargs)
+            finally:
+                socket.setdefaulttimeout(old_timeout)
+        return _socket_timeout
+    return _socket_timeout
 
 
 def open_with_auth(url):
@@ -749,6 +762,8 @@ def open_with_auth(url):
 
     return fp
 
+# adding a timeout to avoid freezing package_index
+open_with_auth = socket_timeout(_SOCKET_TIMEOUT)(open_with_auth)