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

Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2015-11-21 00:05:17 -05:00
parent 0a7b2ae550 e1b02e0459
commit d13cade381
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/idlelib/Debugger.py
View File

@ -19,7 +19,7 @@ class Idb(bdb.Bdb):
message = self.__frame2message(frame) message = self.__frame2message(frame)
try: try:
self.gui.interaction(message, frame) self.gui.interaction(message, frame)
except (TclError, RuntimeError): except TclError: # When closing debugger window with [x] in 3.x
pass pass
def user_exception(self, frame, info): def user_exception(self, frame, info):
@ -105,10 +105,13 @@ class Debugger:
self.interacting = 0 self.interacting = 0
def close(self, event=None): def close(self, event=None):
try:
self.quit()
except Exception:
pass
if self.interacting: if self.interacting:
self.top.bell() self.top.bell()
return return
self.abort_loop()
if self.stackviewer: if self.stackviewer:
self.stackviewer.close(); self.stackviewer = None self.stackviewer.close(); self.stackviewer = None
# Clean up pyshell if user clicked debugger control close widget. # Clean up pyshell if user clicked debugger control close widget.