#5492: merge with 3.3
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
index 4e19226..d8a5cd2 100644
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -367,6 +367,7 @@
self.port = PORT
self.original_compiler_flags = self.compile.compiler.flags
+ _afterid = None
rpcclt = None
rpcsubproc = None
@@ -486,6 +487,8 @@
threading.Thread(target=self.__request_interrupt).start()
def kill_subprocess(self):
+ if self._afterid is not None:
+ self.tkconsole.text.after_cancel(self._afterid)
try:
self.rpcclt.listening_sock.close()
except AttributeError: # no socket
@@ -561,8 +564,8 @@
pass
# Reschedule myself
if not self.tkconsole.closing:
- self.tkconsole.text.after(self.tkconsole.pollinterval,
- self.poll_subprocess)
+ self._afterid = self.tkconsole.text.after(
+ self.tkconsole.pollinterval, self.poll_subprocess)
debugger = None
@@ -973,10 +976,6 @@
self.stop_readline()
self.canceled = True
self.closing = True
- # Wait for poll_subprocess() rescheduling to stop
- self.text.after(2 * self.pollinterval, self.close2)
-
- def close2(self):
return EditorWindow.close(self)
def _close(self):
diff --git a/Misc/NEWS b/Misc/NEWS
index ff88878..8f1ab7f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -455,6 +455,8 @@
IDLE
----
+- Issue #5492: Avoid traceback when exiting IDLE caused by a race condition.
+
- Issue #17511: Keep IDLE find dialog open after clicking "Find Next".
Original patch by Sarah K.