diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-10-10 14:31:46 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-10-10 14:31:46 -0700 |
| commit | 1845168ecf034507cc00ea51837ea93cc440027e (patch) | |
| tree | 2672a026407c2750be530cee5f281ae9596f146d | |
| parent | 98cc1f4c0899bef3277b16b30dd7b00920eba991 (diff) | |
| parent | 24ea6d2f3d76d3c23eac3cb3f83e767ef8fa5f59 (diff) | |
Merge branch '2.1' into 2.2
| -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 55c0fa62..21d2d800 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -857,7 +857,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 |