Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-02 15:44:06 +01:00
Code Issues Projects Releases Wiki Activity

Socket driver: encode strings just before sending them.

Browse Source
This commit is contained in:
Valentin Lorentz 2012-08-05 13:47:48 +02:00
parent 306105abad
commit 041893aaf9
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/drivers/Socket.py
View File

@ -115,14 +115,13 @@ class SocketDriver(drivers.IrcDriver, drivers.ServersMixin):
while msgs[-1] is not None: while msgs[-1] is not None:
msgs.append(self.irc.takeMsg()) msgs.append(self.irc.takeMsg())
del msgs[-1] del msgs[-1]
if sys.version_info[0] < 3:
self.outbuffer += ''.join(imap(str, msgs)) self.outbuffer += ''.join(imap(str, msgs))
else:
self.outbuffer += b''.join([x.encode(errors='replace')
for x in msgs])
if self.outbuffer: if self.outbuffer:
try: try:
if sys.version_info[0] < 3:
sent = self.conn.send(self.outbuffer) sent = self.conn.send(self.outbuffer)
else:
sent = self.conn.send(self.outbuffer.encode())
self.outbuffer = self.outbuffer[sent:] self.outbuffer = self.outbuffer[sent:]
self.eagains = 0 self.eagains = 0
except socket.error, e: except socket.error, e: