summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-02-20 15:42:38 -0800
committerJeff Forcier <jeff@bitprophet.org>2017-02-20 15:42:38 -0800
commitc08d7901f73e610708b43efd4804202d976dedcd (patch)
tree0f30429f5fe92901069f5358f2835b4444c75af8
parent12004eb6869984730a385b833c84daf94a4d422e (diff)
parente096e2c79e463177aa7622b28c2e6e5f3b8fadcd (diff)
Merge branch '1.18' into 2.1
-rw-r--r--paramiko/channel.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/paramiko/channel.py b/paramiko/channel.py
index 69db0107..89e9e5a9 100644
--- a/paramiko/channel.py
+++ b/paramiko/channel.py
@@ -1129,7 +1129,8 @@ class Channel (ClosingContextManager):
self.lock.acquire()
try:
if self.closed:
- # this doesn't seem useful, but it is the documented behavior of Socket
+ # this doesn't seem useful, but it is the documented behavior
+ # of Socket
raise socket.error('Socket is closed')
size = self._wait_for_send_window(size)
if size == 0: