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 | 7e98b3683232c215a4063592ecbc7424c34cc244 (patch) | |
| tree | 5b095ef73a0345a5ef3fe1460b6e68eae69930bf | |
| parent | 87a7d4c034a884b87c9622c42e30841ee34eb476 (diff) | |
| parent | 9b129b262ec04060a3b568cd5a850f341ff0e20e (diff) | |
Merge branch '2.0'
| -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 efc97810..1748314e 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 |