summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2015-12-10 18:32:32 -0800
committerJeff Forcier <jeff@bitprophet.org>2015-12-10 18:32:32 -0800
commit6474ce8bf927680fd9c2eaf24094b09e553dbd52 (patch)
tree30d15b726bcd5488dd282aab08237b3c9e57ecbc
parent1ca3b46a522259ad0f2f4e30edc149b2259bdf23 (diff)
parent99db33d25a21fb87f497af063d736d113733567c (diff)
Merge branch '1.15' into 1.16
-rw-r--r--paramiko/channel.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/paramiko/channel.py b/paramiko/channel.py
index 070009f8..4ce4f286 100644
--- a/paramiko/channel.py
+++ b/paramiko/channel.py
@@ -306,11 +306,11 @@ class Channel (ClosingContextManager):
`.Transport` or session's ``window_size`` (e.g. that set by the
``default_window_size`` kwarg for `.Transport.__init__`) will cause
`.recv_exit_status` to hang indefinitely if it is called prior to a
- sufficiently large `.read` (or if there are no threads calling
- `.read` in the background).
+ sufficiently large `~Channel..read` (or if there are no threads
+ calling `~Channel.read` in the background).
In these cases, ensuring that `.recv_exit_status` is called *after*
- `.read` (or, again, using threads) can avoid the hang.
+ `~Channel.read` (or, again, using threads) can avoid the hang.
:return: the exit code (as an `int`) of the process on the server.