dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't raise timeouts as ProxyCommand failures, thanks @mgedmin

This commit is contained in:
Jeff Forcier 2014-02-13 13:44:46 -08:00
parent 4402f67fa6
commit d438ff6b64
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
paramiko/proxy.py
View File

@ -100,6 +100,8 @@ class ProxyCommand(object):
result = ''.join(self.buffer) result = ''.join(self.buffer)
self.buffer = [] self.buffer = []
return result return result
except socket.timeout:
raise # socket.timeout is a subclass of IOError
except IOError, e: except IOError, e:
raise ProxyCommandFailure(' '.join(self.cmd), e.strerror) raise ProxyCommandFailure(' '.join(self.cmd), e.strerror)