dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Make send() and recv() fail when channel is closed" 

This reverts commit 23f3099b6f.
This commit is contained in:
Jeff Forcier 2012-11-29 15:19:56 -08:00
parent 2223aa10cc
commit 531606b0d6
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
paramiko/channel.py
View File

@ -605,10 +605,6 @@ class Channel (object):
@raise socket.timeout: if no data is ready before the timeout set by @raise socket.timeout: if no data is ready before the timeout set by
L{settimeout}. L{settimeout}.
""" """
if self.closed:
# this doesn't seem useful, but it is the documented behavior of Socket
raise socket.error(errno.EBADF, 'Socket is closed')
try: try:
out = self.in_buffer.read(nbytes, self.timeout) out = self.in_buffer.read(nbytes, self.timeout)
except PipeTimeout, e: except PipeTimeout, e:
@ -659,10 +655,6 @@ class Channel (object):
@since: 1.1 @since: 1.1
""" """
if self.closed:
# this doesn't seem useful, but it is the documented behavior of Socket
raise socket.error(errno.EBADF, 'Socket is closed')
try: try:
out = self.in_stderr_buffer.read(nbytes, self.timeout) out = self.in_stderr_buffer.read(nbytes, self.timeout)
except PipeTimeout, e: except PipeTimeout, e:
@ -716,10 +708,6 @@ class Channel (object):
@raise socket.timeout: if no data could be sent before the timeout set @raise socket.timeout: if no data could be sent before the timeout set
by L{settimeout}. by L{settimeout}.
""" """
if self.closed:
# this doesn't seem useful, but it is the documented behavior of Socket
raise socket.error(errno.EBADF, 'Socket is closed')
size = len(s) size = len(s)
self.lock.acquire() self.lock.acquire()
try: try:
@ -757,10 +745,6 @@ class Channel (object):
@since: 1.1 @since: 1.1
""" """
if self.closed:
# this doesn't seem useful, but it is the documented behavior of Socket
raise socket.error(errno.EBADF, 'Socket is closed')
size = len(s) size = len(s)
self.lock.acquire() self.lock.acquire()
try: try:
@ -799,6 +783,9 @@ class Channel (object):
This is irritating, but identically follows python's API. This is irritating, but identically follows python's API.
""" """
while s: while s:
if self.closed:
# this doesn't seem useful, but it is the documented behavior of Socket
raise socket.error('Socket is closed')
sent = self.send(s) sent = self.send(s)
s = s[sent:] s = s[sent:]
return None return None