Mercurial > cpython-lru_cache-weakref
diff Lib/idlelib/PyShell.py @ 34241:a15fa059f9f0 2.3
The GUI was hanging if the shell window was closed while a raw_input()
was pending. Restored the quit() of the readline() mainloop().
http://mail.python.org/pipermail/idle-dev/2004-December/002307.html
M NEWS.txt
M PyShell.py
| author | Kurt B. Kaiser <kbk@shore.net> |
|---|---|
| date | Thu, 23 Dec 2004 04:26:55 +0000 |
| parents | fe242f69a9d3 |
| children |
line wrap: on
line diff
--- a/Lib/idlelib/PyShell.py Wed Dec 22 16:11:32 2004 +0000 +++ b/Lib/idlelib/PyShell.py Thu Dec 23 04:26:55 2004 +0000 @@ -877,6 +877,9 @@ parent=self.text) if response == False: return "cancel" + if self.reading: + self.top.quit() + self.canceled = True self.closing = True # Wait for poll_subprocess() rescheduling to stop self.text.after(2 * self.pollinterval, self.close2) @@ -941,10 +944,12 @@ save = self.reading try: self.reading = 1 - self.top.mainloop() + self.top.mainloop() # nested mainloop() finally: self.reading = save line = self.text.get("iomark", "end-1c") + if len(line) == 0: # may be EOF if we quit our mainloop with Ctrl-C + line = "\n" if isinstance(line, unicode): import IOBinding try: @@ -954,10 +959,11 @@ self.resetoutput() if self.canceled: self.canceled = 0 - raise KeyboardInterrupt + if not use_subprocess: + raise KeyboardInterrupt if self.endoffile: self.endoffile = 0 - return "" + line = "" return line def isatty(self): @@ -976,13 +982,13 @@ return "break" self.endoffile = 0 self.canceled = 1 - if self.reading: - self.top.quit() - elif (self.executing and self.interp.rpcclt): + if (self.executing and self.interp.rpcclt): if self.interp.getdebugger(): self.interp.restart_subprocess() else: self.interp.interrupt_subprocess() + if self.reading: + self.top.quit() # exit the nested mainloop() in readline() return "break" def eof_callback(self, event):