summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2015-11-21 05:05:17 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2015-11-21 05:05:17 (GMT)
commitd13cade3817cf452b7c98e9df96b15c6da68201a (patch)
treecc16e1b1811ae2258066f8fd4d414418e0266892 /Lib/idlelib
parent0a7b2ae55070417396c22c1fa909ee256d6d3ab6 (diff)
parente1b02e045921b60be0997c133033ecd21d642e89 (diff)
downloadcpython-d13cade3817cf452b7c98e9df96b15c6da68201a.zip
cpython-d13cade3817cf452b7c98e9df96b15c6da68201a.tar.gz
cpython-d13cade3817cf452b7c98e9df96b15c6da68201a.tar.bz2
Merge with 3.4
Diffstat (limited to 'Lib/idlelib')
-rw-r--r--Lib/idlelib/Debugger.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/idlelib/Debugger.py b/Lib/idlelib/Debugger.py
index d86c79c..250422e 100644
--- a/Lib/idlelib/Debugger.py
+++ b/Lib/idlelib/Debugger.py
@@ -19,7 +19,7 @@ class Idb(bdb.Bdb):
message = self.__frame2message(frame)
try:
self.gui.interaction(message, frame)
- except (TclError, RuntimeError):
+ except TclError: # When closing debugger window with [x] in 3.x
pass
def user_exception(self, frame, info):
@@ -105,10 +105,13 @@ class Debugger:
self.interacting = 0
def close(self, event=None):
+ try:
+ self.quit()
+ except Exception:
+ pass
if self.interacting:
self.top.bell()
return
- self.abort_loop()
if self.stackviewer:
self.stackviewer.close(); self.stackviewer = None
# Clean up pyshell if user clicked debugger control close widget.