diff -r 4c896f626bd6 -r 4affedf129c5 DebugClients/Python3/DebugBase.py --- a/DebugClients/Python3/DebugBase.py Wed Aug 03 21:41:40 2016 +0200 +++ b/DebugClients/Python3/DebugBase.py Mon Aug 08 22:02:45 2016 +0200 @@ -279,19 +279,17 @@ @rtype trace function or None @exception bdb.BdbQuit """ - if self.quitting: - return # None - # give the client a chance to push through new break points. if self.eventPollFlag: self._dbgClient.eventPoll() self.eventPollFlag = False + + if self.quitting: + raise bdb.BdbQuit if event == 'line': if self.stop_here(frame) or self.break_here(frame): self.user_line(frame) - if self.quitting: - raise bdb.BdbQuit return if event == 'call': @@ -306,8 +304,6 @@ Watch.watches != []): # No need to trace this function return - if self.quitting: - raise bdb.BdbQuit return self.trace_dispatch if event == 'return': @@ -337,8 +333,6 @@ if not (frame.f_code.co_flags & CO_GENERATOR and arg[0] is StopIteration and arg[2] is None): self.user_exception(frame, arg) - if self.quitting: - raise bdb.BdbQuit # Stop at the StopIteration or GeneratorExit exception when the # user has set stopframe in a generator by issuing a return # command, or a next/until command at the last statement in the @@ -347,8 +341,6 @@ self.stopframe.f_code.co_flags & CO_GENERATOR and arg[0] in (StopIteration, GeneratorExit)): self.user_exception(frame, arg) - if self.quitting: - raise bdb.BdbQuit return if event == 'c_call':