aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-12-03 09:09:38 -0500
committerGitHub <noreply@github.com>2016-12-03 09:09:38 -0500
commit53581171ae55db1d49229587acc29ef75a73e370 (patch)
treeb315284823c8279acf363def158440d5e2e1b204 /setuptools
parent5ff82539955b291be7b638a38ed4775960417681 (diff)
parent161c0a5072f6049f6e4790969a387e9aae41ad52 (diff)
downloadexternal_python_setuptools-53581171ae55db1d49229587acc29ef75a73e370.tar.gz
external_python_setuptools-53581171ae55db1d49229587acc29ef75a73e370.tar.bz2
external_python_setuptools-53581171ae55db1d49229587acc29ef75a73e370.zip
Merge pull request #846 from jmuchemb/pkg-idx-timeout
package_index: fix bug not catching some network timeouts
Diffstat (limited to 'setuptools')
-rwxr-xr-xsetuptools/package_index.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 024fab98..d80d43bc 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -768,7 +768,7 @@ class PackageIndex(Environment):
'down, %s' %
(url, v.line)
)
- except http_client.HTTPException as v:
+ except (http_client.HTTPException, socket.error) as v:
if warning:
self.warn(warning, v)
else: