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 | 24ea6d2f3d76d3c23eac3cb3f83e767ef8fa5f59 (patch) | |
| tree | 3b1932f14cc54c242ab7c77cd69ee8e4b97f874d | |
| parent | 5d020d42f650c8d845d307d578ba4d31466671be (diff) | |
| parent | a01277c93f56013f7a856e36b5e497a1eab19753 (diff) | |
| download | paramiko-24ea6d2f3d76d3c23eac3cb3f83e767ef8fa5f59.tar.gz | |
Merge branch '2.0' into 2.1
| -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 7d5cde56..c4305f44 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -845,7 +845,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 |