Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions Lib/idlelib/idle_test/test_rpc.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,28 @@
"Test rpc, coverage 20%."

from idlelib import rpc
import socket
import struct
import unittest


class SocketIOTest(unittest.TestCase):

def test_reconnect_discards_partial_packet(self):
# gh-89544: RPCClient.accept() reinitializes the SocketIO after
# a restart; a partially received packet must not be kept.
old_sock, old_peer = socket.socketpair()
new_sock, new_peer = socket.socketpair()
with old_sock, old_peer, new_sock, new_peer:
sockio = rpc.SocketIO(old_sock)
old_peer.sendall(struct.pack('<i', 100) + b'x' * 10)
self.assertIsNone(sockio.pollpacket(1))
sockio.close()
rpc.SocketIO.__init__(sockio, new_sock)
new_peer.sendall(struct.pack('<i', 3) + b'abc')
self.assertEqual(sockio.pollpacket(1), b'abc')



class CodePicklerTest(unittest.TestCase):

Expand Down
9 changes: 5 additions & 4 deletions Lib/idlelib/rpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,11 @@ def __init__(self, sock, objtable=None, debugging=None):
self.objtable = objtable
self.responses = {}
self.cvars = {}
# Receive buffer state. A new connection must not inherit a
# partially received packet from the old one (gh-89544).
self.buff = b''
self.bufneed = 4
self.bufstate = 0 # meaning: 0 => reading count; 1 => reading data

def close(self):
sock = self.sock
Expand Down Expand Up @@ -345,10 +350,6 @@ def putmessage(self, message):
raise OSError("socket no longer exists")
s = s[n:]

buff = b''
bufneed = 4
bufstate = 0 # meaning: 0 => reading count; 1 => reading data

def pollpacket(self, wait):
self._stage0()
if len(self.buff) < self.bufneed:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix IDLE hanging after Restart Shell while receiving a large output from the
user process.
Loading