cpython: 187da33826eb (original) (raw)

Mercurial > cpython

changeset 84097:187da33826eb

#5492: merge with 3.3 [#5492]

Roger Serwy roger.serwy@gmail.com
date	Tue, 11 Jun 2013 22:13:51 -0500
parents	e6fc120012e5(current diff)da852f5250af(diff)
children	479aad3bb122
files	Lib/idlelib/PyShell.py Misc/NEWS
diffstat	2 files changed, 7 insertions(+), 6 deletions(-)[+] [-] Lib/idlelib/PyShell.py 11 Misc/NEWS 2

line wrap: on

line diff

--- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -367,6 +367,7 @@ class ModifiedInterpreter(InteractiveInt self.port = PORT self.original_compiler_flags = self.compile.compiler.flags

_afterid = None rpcclt = None rpcsubproc = None @@ -486,6 +487,8 @@ class ModifiedInterpreter(InteractiveInt threading.Thread(target=self.__request_interrupt).start()

def kill_subprocess(self):

   if self._afterid is not None:[](#l1.15)

       self.tkconsole.text.after_cancel(self._afterid)[](#l1.16)
   try:[](#l1.17)
       self.rpcclt.listening_sock.close()[](#l1.18)
   except AttributeError:  # no socket[](#l1.19)

@@ -561,8 +564,8 @@ class ModifiedInterpreter(InteractiveInt pass # Reschedule myself if not self.tkconsole.closing:

       self.tkconsole.text.after(self.tkconsole.pollinterval,[](#l1.24)

                                 self.poll_subprocess)[](#l1.25)

       self._afterid = self.tkconsole.text.after([](#l1.26)

           self.tkconsole.pollinterval, self.poll_subprocess)[](#l1.27)

debugger = None @@ -973,10 +976,6 @@ class PyShell(OutputWindow): self.stop_readline() self.canceled = True self.closing = True

   # Wait for poll_subprocess() rescheduling to stop[](#l1.35)

   self.text.after(2 * self.pollinterval, self.close2)[](#l1.36)

def close2(self): return EditorWindow.close(self)

def _close(self):

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -455,6 +455,8 @@ C-API 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.