diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-07-25 20:41:06 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-07-25 20:41:06 -0700 |
| commit | 714595eee85d3db602c2003598eb05d14c56641f (patch) | |
| tree | 22e563f1c184a666532072eb6e55b757a2210501 | |
| parent | 1e48f4bf4673ab9f917227f06e6ab9d049af87f0 (diff) | |
| parent | c0c0dffb8b5827c2cf449b5247cfe590ebd0f6df (diff) | |
Merge branch '1.16' into 1.17
| -rw-r--r-- | paramiko/channel.py | 6 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/paramiko/channel.py b/paramiko/channel.py index 3c43eb10..3a05bdc4 100644 --- a/paramiko/channel.py +++ b/paramiko/channel.py @@ -887,6 +887,12 @@ class Channel (ClosingContextManager): """ self.shutdown(1) + @property + def _closed(self): + # Concession to Python 3's socket API, which has a private ._closed + # attribute instead of a semipublic .closed attribute. + return self.closed + ### calls from Transport def _set_transport(self, transport): diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 16f9ff06..ee179526 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,10 @@ Changelog ========= +* :bug:`774 (1.16+)` Add a ``_closed`` private attribute to + `~paramiko.channel.Channel` objects so that they continue functioning when + used as proxy sockets under Python 3 (e.g. as ``direct-tcpip`` gateways for + other Paramiko connections.) * :bug:`758 (1.16+)` Apply type definitions to ``_winapi`` module from `jaraco.windows <https://github.com/jaraco/jaraco.windows>`_ 3.6.1. This should address issues on Windows platforms that often result in errors like |