diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-04-24 13:13:17 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-04-24 13:13:17 -0700 |
| commit | 078b7c003bb2fd9423d23ce49e8de9f937dcfeea (patch) | |
| tree | eb1db95a55b60d0d1caecc08a0e2479c64c54d56 | |
| parent | ec7059d79770bb9890abd5c0514b67af7e9d2d52 (diff) | |
| parent | 488b84dc8fdba312cdaacdff7dedbb89b1b52d15 (diff) | |
Merge branch '1.16'
| -rw-r--r-- | paramiko/channel.py | 5 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/paramiko/channel.py b/paramiko/channel.py index 4ce4f286..3c43eb10 100644 --- a/paramiko/channel.py +++ b/paramiko/channel.py @@ -88,15 +88,20 @@ class Channel (ClosingContextManager): :param int chanid: the ID of this channel, as passed by an existing `.Transport`. """ + #: Channel ID self.chanid = chanid + #: Remote channel ID self.remote_chanid = 0 + #: `.Transport` managing this channel self.transport = None + #: Whether the connection is presently active self.active = False self.eof_received = 0 self.eof_sent = 0 self.in_buffer = BufferedPipe() self.in_stderr_buffer = BufferedPipe() self.timeout = None + #: Whether the connection has been closed self.closed = False self.ultra_debug = False self.lock = threading.Lock() diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index f1e0c471..f662ae9a 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,9 @@ Changelog ========= +* :support:`621 backported` Annotate some public attributes on + `~paramiko.channel.Channel` such as ``.closed``. Thanks to Sergey Vasilyev + for the report. * :bug:`632` Fix logic bug in the SFTP client's callback-calling functionality; previously there was a chance the given callback would fire twice at the end of a transfer. Thanks to ``@ab9-er`` for catch & original patch. |