summaryrefslogtreecommitdiff
path: root/paramiko/proxy.py
diff options
context:
space:
mode:
authorScott Maxwell <scott@codecobblers.com>2014-03-07 20:45:26 -0800
committerScott Maxwell <scott@codecobblers.com>2014-03-07 20:45:26 -0800
commitf0017b83309899bf6fffc0fa90093c36f1a7f7ea (patch)
tree582d35dee4b32f022bddc2245731a76112f7ac8e /paramiko/proxy.py
parent073c71a8223ff77cacd8c555ef63ce24f0c3d50c (diff)
downloadparamiko-f0017b83309899bf6fffc0fa90093c36f1a7f7ea.tar.gz
Fix import * and a bunch of PEP8 formatting
Diffstat (limited to 'paramiko/proxy.py')
-rw-r--r--paramiko/proxy.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/paramiko/proxy.py b/paramiko/proxy.py
index c7e93efa..8959b244 100644
--- a/paramiko/proxy.py
+++ b/paramiko/proxy.py
@@ -80,7 +80,7 @@ class ProxyCommand(object):
while len(self.buffer) < size:
if self.timeout is not None:
elapsed = (datetime.now() - start).microseconds
- timeout = self.timeout * 1000 * 1000 # to microseconds
+ timeout = self.timeout * 1000 * 1000 # to microseconds
if elapsed >= timeout:
raise socket.timeout()
r, w, x = select([self.process.stdout], [], [], 0.0)
@@ -94,7 +94,7 @@ class ProxyCommand(object):
self.buffer = []
return result
except socket.timeout:
- raise # socket.timeout is a subclass of IOError
+ raise # socket.timeout is a subclass of IOError
except IOError as e:
raise ProxyCommandFailure(' '.join(self.cmd), e.strerror)