# HG changeset patch # User laurent # Date 1275649775 -7200 # Node ID ab7916df0de7a6b148a4ef39b1cf2044bb2e51c9 # Parent d18e86b603bc17948072eba385cac68ae62341fa Bug with recv from socket fixed diff -r d18e86b603bc -r ab7916df0de7 LPCBeremiz.py --- a/LPCBeremiz.py Fri Jun 04 11:27:00 2010 +0200 +++ b/LPCBeremiz.py Fri Jun 04 13:09:35 2010 +0200 @@ -870,8 +870,7 @@ self.PluginRoot.KillDebugThread() self.KillLocalRuntime() - print "Closed" - sys.stdout.flush() + lpcberemiz_cmd.Log.write("Closed\n") event.Veto() @@ -1065,12 +1064,21 @@ def __init__(self, port): self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.socket.connect(('localhost', port)) + self.Buffer = "" def __del__(self): self.socket.close() def readline(self): - return self.socket.recv(2048) + idx = self.Buffer.find("\n") + if idx == -1: + self.Buffer += self.socket.recv(2048) + idx = self.Buffer.find("\n") + if idx != -1: + line = self.Buffer[:idx+1] + self.Buffer = self.Buffer[idx+1:] + return line + return "" """ Base class for file like objects to facilitate StdOut for the Shell.""" def write(self, s, style = None):