From d438ff6b64f1c20b78fc1824bacba9659653ecd1 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Thu, 13 Feb 2014 13:44:46 -0800 Subject: [PATCH] Don't raise timeouts as ProxyCommand failures, thanks @mgedmin --- paramiko/proxy.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/paramiko/proxy.py b/paramiko/proxy.py index 722590c..3f5c8bb 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)