diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-10-10 14:31:47 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-10-10 14:31:47 -0700 |
| commit | a1e432e80bf221e527f3dbb6ee79cecfb10871a2 (patch) | |
| tree | da163fb1ccf1cd9210a6d0e36c06a22536846615 | |
| parent | 327e973365b8ba28db37e70f6f1f3ea1adca867a (diff) | |
| parent | 1845168ecf034507cc00ea51837ea93cc440027e (diff) | |
Merge branch '2.2' into 2.3
| -rw-r--r-- | paramiko/transport.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py index f07aec72..9df34caf 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -890,7 +890,7 @@ class Transport(threading.Thread, ClosingContextManager): if event.is_set(): break elif start_ts + timeout < time.time(): - raise SSHException('Timeout openning channel.') + raise SSHException('Timeout opening channel.') chan = self._channels.get(chanid) if chan is not None: return chan |