summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--paramiko/proxy.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/paramiko/proxy.py b/paramiko/proxy.py
index 722590ce..3f5c8bb2 100644
--- a/paramiko/proxy.py
+++ b/paramiko/proxy.py
@@ -100,6 +100,8 @@ class ProxyCommand(object):
result = ''.join(self.buffer)
self.buffer = []
return result
+ except socket.timeout:
+ raise # socket.timeout is a subclass of IOError
except IOError, e:
raise ProxyCommandFailure(' '.join(self.cmd), e.strerror)