diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2015-11-21 05:05:35 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2015-11-21 05:05:35 (GMT) |
| commit | 266b276f34db5cc106d100f63b631af1f1f8e0e2 (patch) | |
| tree | 12d1becbd2f8c8250956798e7566c7966833d53f | |
| parent | 20fe98350eef84537183e4e778bf6a1b0e289d8a (diff) | |
| parent | d13cade3817cf452b7c98e9df96b15c6da68201a (diff) | |
| download | cpython-266b276f34db5cc106d100f63b631af1f1f8e0e2.zip cpython-266b276f34db5cc106d100f63b631af1f1f8e0e2.tar.gz cpython-266b276f34db5cc106d100f63b631af1f1f8e0e2.tar.bz2 | |
Merge with 3.5
| -rw-r--r-- | Lib/idlelib/Debugger.py | 7 |
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. |