Merge branch '2.0'

ghosthamlet · Jul 26, 2016 · 7e98b36 · 7e98b36
2 parents 87a7d4c + 9b129b2
commit 7e98b36
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/paramiko/channel.py b/paramiko/channel.py
@@ -887,6 +887,12 @@ def shutdown_write(self):
         """
         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
@@ -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