diff -r d57f18f15f1a -r 9899fb545b1f DebugClients/Python3/DebugBase.py --- a/DebugClients/Python3/DebugBase.py Wed Jul 20 22:14:24 2016 +0200 +++ b/DebugClients/Python3/DebugBase.py Sat Jul 23 14:12:07 2016 +0200 @@ -336,10 +336,10 @@ 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 generator before the - # exception. + # 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 + # generator before the exception. elif (self.stopframe and frame is not self.stopframe and self.stopframe.f_code.co_flags & CO_GENERATOR and arg[0] in (StopIteration, GeneratorExit)): @@ -433,6 +433,7 @@ """ Private method to check if the function / method has a line number which is a breakpoint. + @param frame the frame object @type frame object @return Flag indicating a function / method with breakpoint @@ -445,7 +446,8 @@ except KeyError: filename = self.fix_frame_filename(frame) if filename not in Breakpoint.breakInFile: - Breakpoint.breakInFrameCache[frame.f_globals.get('__file__'), + Breakpoint.breakInFrameCache[ + frame.f_globals.get('__file__'), frame.f_code.co_firstlineno] = False return False lineNo = frame.f_code.co_firstlineno @@ -462,7 +464,8 @@ frame.f_globals.get('__file__'), frame.f_code.co_firstlineno] = True return True - Breakpoint.breakInFrameCache[frame.f_globals.get('__file__'), + Breakpoint.breakInFrameCache[ + frame.f_globals.get('__file__'), frame.f_code.co_firstlineno] = False return False @@ -508,8 +511,8 @@ @type int """ Breakpoint.clear_break(filename, lineno) - self._dbgClient.write('%s%s,%d\n' % (ResponseClearBreak, filename, - lineno)) + self._dbgClient.write('{0}{1},{2:d}\n'.format( + ResponseClearBreak, filename, lineno)) def __do_clearWatch(self, cond): """ @@ -519,7 +522,7 @@ @type str """ Watch.clear_watch(cond) - self._dbgClient.write('%s%s\n' % (ResponseClearWatch, cond)) + self._dbgClient.write('{0}{1}\n'.format(ResponseClearWatch, cond)) def getStack(self): """