traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use buffer of type 'bytes' to accumulate from socket.

This commit is contained in:
Kurt B. Kaiser 2007-08-22 21:33:27 +00:00
parent e20a2c1397
commit 2d726df26e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Lib/idlelib/rpc.py
View File

@ -337,13 +337,13 @@ class SocketIO(object):
else: else:
s = s[n:] s = s[n:]
buffer = "" buff = b''
bufneed = 4 bufneed = 4
bufstate = 0 # meaning: 0 => reading count; 1 => reading data bufstate = 0 # meaning: 0 => reading count; 1 => reading data
def pollpacket(self, wait): def pollpacket(self, wait):
self._stage0() self._stage0()
if len(self.buffer) < self.bufneed: if len(self.buff) < self.bufneed:
r, w, x = select.select([self.sock.fileno()], [], [], wait) r, w, x = select.select([self.sock.fileno()], [], [], wait)
if len(r) == 0: if len(r) == 0:
return None return None
@ -353,21 +353,21 @@ class SocketIO(object):
raise EOFError raise EOFError
if len(s) == 0: if len(s) == 0:
raise EOFError raise EOFError
self.buffer += s self.buff += s
self._stage0() self._stage0()
return self._stage1() return self._stage1()
def _stage0(self): def _stage0(self):
if self.bufstate == 0 and len(self.buffer) >= 4: if self.bufstate == 0 and len(self.buff) >= 4:
s = self.buffer[:4] s = self.buff[:4]
self.buffer = self.buffer[4:] self.buff = self.buff[4:]
self.bufneed = struct.unpack("<i", s)[0] self.bufneed = struct.unpack("<i", s)[0]
self.bufstate = 1 self.bufstate = 1
def _stage1(self): def _stage1(self):
if self.bufstate == 1 and len(self.buffer) >= self.bufneed: if self.bufstate == 1 and len(self.buff) >= self.bufneed:
packet = self.buffer[:self.bufneed] packet = self.buff[:self.bufneed]
self.buffer = self.buffer[self.bufneed:] self.buff = self.buff[self.bufneed:]
self.bufneed = 4 self.bufneed = 4
self.bufstate = 0 self.bufstate = 0
return packet return packet