diff options
author | Senthil Kumaran <orsenthil@gmail.com> | 2010-11-29 12:41:03 +0000 |
---|---|---|
committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-11-29 12:41:03 +0000 |
commit | 9a5897bbf816404c081944187df6acc78811491a (patch) | |
tree | fb7f5a1e06d6341babb1259860152ae2a002238c /Lib/bdb.py | |
parent | 8244c575ed4b57fa9742dbd4a7efeb4cb7766c8d (diff) | |
download | cpython-git-9a5897bbf816404c081944187df6acc78811491a.tar.gz |
Merged revisions 86861 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86861 | senthil.kumaran | 2010-11-29 19:54:17 +0800 (Mon, 29 Nov 2010) | 5 lines
Fix #10561 - Fix pdb behavior. Delete the breakpoints by breakpoint number.
Handle multiple breakpoints at same line. Update docs/test.
Patch by Xavier de Gaye.
........
Diffstat (limited to 'Lib/bdb.py')
-rw-r--r-- | Lib/bdb.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Lib/bdb.py b/Lib/bdb.py index d0fcff8dc9..6aad9793f9 100644 --- a/Lib/bdb.py +++ b/Lib/bdb.py @@ -250,6 +250,12 @@ class Bdb: list.append(lineno) bp = Breakpoint(filename, lineno, temporary, cond, funcname) + def _prune_breaks(self, filename, lineno): + if (filename, lineno) not in Breakpoint.bplist: + self.breaks[filename].remove(lineno) + if not self.breaks[filename]: + del self.breaks[filename] + def clear_break(self, filename, lineno): filename = self.canonic(filename) if not filename in self.breaks: @@ -261,10 +267,7 @@ class Bdb: # pair, then remove the breaks entry for bp in Breakpoint.bplist[filename, lineno][:]: bp.deleteMe() - if (filename, lineno) not in Breakpoint.bplist: - self.breaks[filename].remove(lineno) - if not self.breaks[filename]: - del self.breaks[filename] + self._prune_breaks(filename, lineno) def clear_bpbynumber(self, arg): try: @@ -277,7 +280,8 @@ class Bdb: return 'Breakpoint number (%d) out of range' % number if not bp: return 'Breakpoint (%d) already deleted' % number - self.clear_break(bp.file, bp.line) + bp.deleteMe() + self._prune_breaks(bp.file, bp.line) def clear_all_file_breaks(self, filename): filename = self.canonic(filename) |