aboutsummaryrefslogtreecommitdiff
path: root/paramiko/client.py
diff options
context:
space:
mode:
authorJeremy T. Bouse <Jeremy.Bouse@UnderGrid.net>2015-10-25 22:29:44 -0400
committerJeremy T. Bouse <Jeremy.Bouse@UnderGrid.net>2015-10-25 22:29:44 -0400
commitad30777fe9b9b34797ba7487056966d27d890974 (patch)
treefd14ac1ad24a701986483860e1218e7cdc09c732 /paramiko/client.py
parent767153f789ed210fe00509f591b013320fc0f3fa (diff)
parentbf855e6da326dba0c46f005eedc9f390c6c3b206 (diff)
downloadpython-paramiko-ad30777fe9b9b34797ba7487056966d27d890974.tar
python-paramiko-ad30777fe9b9b34797ba7487056966d27d890974.tar.gz
Merge tag 'upstream/1.15.3'
Upstream version 1.15.3
Diffstat (limited to 'paramiko/client.py')
-rw-r--r--paramiko/client.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/paramiko/client.py b/paramiko/client.py
index 393e3e0..9ee3028 100644
--- a/paramiko/client.py
+++ b/paramiko/client.py
@@ -338,7 +338,7 @@ class SSHClient (ClosingContextManager):
:raises SSHException: if the server fails to execute the command
"""
- chan = self._transport.open_session()
+ chan = self._transport.open_session(timeout=timeout)
if get_pty:
chan.get_pty()
chan.settimeout(timeout)