summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-10-10 14:31:47 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-10-10 14:31:47 -0700
commitcea86456c446b3f60f04c912bbac164e2014cb81 (patch)
treeda163fb1ccf1cd9210a6d0e36c06a22536846615
parentba0be7c24a5e3e917c93553c5b891ff2cb5811c9 (diff)
parenta1e432e80bf221e527f3dbb6ee79cecfb10871a2 (diff)
downloadparamiko-cea86456c446b3f60f04c912bbac164e2014cb81.tar.gz
Merge branch '2.3'
-rw-r--r--paramiko/transport.py2
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