mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix test_asyncore after merge. It needs to use bytes.

Browse source
This commit is contained in:
Guido van Rossum 2007-07-18 20:57:44 +00:00
parent b5a755e46c
commit df4a743ac0
2 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/asyncore.py
View file

@ -344,14 +344,14 @@ class dispatcher:
# a closed connection is indicated by signaling
# a read condition, and having recv() return 0.
self.handle_close()
return ''
return b''
else:
return data
except socket.error as why:
# winsock sometimes throws ENOTCONN
if why[0] in [ECONNRESET, ENOTCONN, ESHUTDOWN]:
self.handle_close()
return ''
return b''
else:
raise
@ -447,7 +447,7 @@ class dispatcher_with_send(dispatcher):
def __init__(self, sock=None, map=None):
dispatcher.__init__(self, sock, map)
self.out_buffer = ''
self.out_buffer = b''
def initiate_send(self):
num_sent = 0
@ -461,6 +461,7 @@ class dispatcher_with_send(dispatcher):
return (not self.connected) or len(self.out_buffer)
def send(self, data):
assert isinstance(data, bytes)
if self.debug:
self.log_info('sending %s' % repr(data))
self.out_buffer = self.out_buffer + data