--- a/DebugClients/Python/BreakpointWatch.py Fri Feb 17 18:34:11 2017 +0100 +++ b/DebugClients/Python/BreakpointWatch.py Fri Feb 17 22:01:46 2017 +0100 @@ -50,21 +50,21 @@ self.enabled = True self.ignore = 0 self.hits = 0 - self.breaks[filename, lineno] = self - lines = self.breakInFile.setdefault(filename, []) + Breakpoint.breaks[(filename, lineno)] = self + lines = Breakpoint.breakInFile.setdefault(filename, []) if lineno not in lines: lines.append(lineno) - self.breakInFrameCache.clear() + Breakpoint.breakInFrameCache.clear() def deleteMe(self): """ Public method to clear this breakpoint. """ try: - del self.breaks[(self.file, self.line)] - self.breakInFile[self.file].remove(self.line) - if not self.breakInFile[self.file]: - del self.breakInFile[self.file] + del Breakpoint.breaks[(self.file, self.line)] + Breakpoint.breakInFile[self.file].remove(self.line) + if not Breakpoint.breakInFile[self.file]: + del Breakpoint.breakInFile[self.file] except KeyError: pass @@ -100,8 +100,8 @@ """ Public method to clear all breakpoints. """ - for bp in Breakpoint.breaks.copy(): - bp.deleteMe() + Breakpoint.breaks.clear() + Breakpoint.breakInFile.clear() Breakpoint.breakInFrameCache.clear() @staticmethod @@ -222,14 +222,14 @@ self.changed = True self.values = {} - self.watches.append(self) + Watch.watches.append(self) def deleteMe(self): """ Public method to clear this watch expression. """ try: - del self.watches[self] + del Watch.watches[self] except ValueError: pass