Mailman 3 November 2010 - Python-checkins

r86869 - python/branches/py3k/Lib/bdb.py
by georg.brandl Nov. 29, 2010

Nov. 29, 2010

Author: georg.brandl Date: Mon Nov 29 21:12:24 2010 New Revision: 86869 Log: Code style cleanup in bdb. Modified: python/branches/py3k/Lib/bdb.py Modified: python/branches/py3k/Lib/bdb.py ============================================================================== --- python/branches/py3k/Lib/bdb.py (original) +++ python/branches/py3k/Lib/bdb.py Mon Nov 29 21:12:24 2010 @@ -3,16 +3,14 @@ import fnmatch import sys import os -import types -__all__ = ["BdbQuit","Bdb","Breakpoint"] +__all__ = ["BdbQuit", "Bdb", "Breakpoint"] class BdbQuit(Exception): - """Exception to give up completely""" + """Exception to give up completely.""" class Bdb: - """Generic Python debugger base class. This class takes care of details of the trace facility; @@ -120,14 +118,14 @@ def break_here(self, frame): filename = self.canonic(frame.f_code.co_filename) - if not filename in self.breaks: + if filename not in self.breaks: return False lineno = frame.f_lineno - if not lineno in self.breaks[filename]: + if lineno not in self.breaks[filename]: # The line itself has no breakpoint, but maybe the line is the # first line of a function with breakpoint set by function name. lineno = frame.f_code.co_firstlineno - if not lineno in self.breaks[filename]: + if lineno not in self.breaks[filename]: return False # flag says ok to delete temp. bp @@ -243,12 +241,9 @@ import linecache # Import as late as possible line = linecache.getline(filename, lineno) if not line: - return 'Line %s:%d does not exist' % (filename, - lineno) - if not filename in self.breaks: - self.breaks[filename] = [] - list = self.breaks[filename] - if not lineno in list: + return 'Line %s:%d does not exist' % (filename, lineno) + list = self.breaks.setdefault(filename, []) + if lineno not in list: list.append(lineno) bp = Breakpoint(filename, lineno, temporary, cond, funcname) @@ -260,11 +255,10 @@ def clear_break(self, filename, lineno): filename = self.canonic(filename) - if not filename in self.breaks: + if filename not in self.breaks: return 'There are no breakpoints in %s' % filename if lineno not in self.breaks[filename]: - return 'There is no breakpoint at %s:%d' % (filename, - lineno) + return 'There is no breakpoint at %s:%d' % (filename, lineno) # If there's only one bp in the list for that file,line # pair, then remove the breaks entry for bp in Breakpoint.bplist[filename, lineno][:]: @@ -281,7 +275,7 @@ def clear_all_file_breaks(self, filename): filename = self.canonic(filename) - if not filename in self.breaks: + if filename not in self.breaks: return 'There are no breakpoints in %s' % filename for line in self.breaks[filename]: blist = Breakpoint.bplist[filename, line] @@ -354,31 +348,30 @@ i = max(0, len(stack) - 1) return stack, i - # - def format_stack_entry(self, frame_lineno, lprefix=': '): import linecache, reprlib frame, lineno = frame_lineno filename = self.canonic(frame.f_code.co_filename) s = '%s(%r)' % (filename, lineno) if frame.f_code.co_name: - s = s + frame.f_code.co_name + s += frame.f_code.co_name else: - s = s + "<lambda>" + s += "<lambda>" if '__args__' in frame.f_locals: args = frame.f_locals['__args__'] else: args = None if args: - s = s + reprlib.repr(args) + s += reprlib.repr(args) else: - s = s + '()' + s += '()' if '__return__' in frame.f_locals: rv = frame.f_locals['__return__'] - s = s + '->' - s = s + reprlib.repr(rv) + s += '->' + s += reprlib.repr(rv) line = linecache.getline(filename, lineno, frame.f_globals) - if line: s = s + lprefix + line.strip() + if line: + s += lprefix + line.strip() return s # The following methods can be called by clients to use @@ -442,8 +435,7 @@ class Breakpoint: - - """Breakpoint class + """Breakpoint class. Implements temporary breakpoints, ignore counts, disabling and (re)-enabling, and conditionals. @@ -485,7 +477,6 @@ else: self.bplist[file, line] = [self] - def deleteMe(self): index = (self.file, self.line) self.bpbynumber[self.number] = None # No longer in list @@ -606,6 +597,7 @@ return (b, False) return (None, None) + # -------------------- testing -------------------- class Tdb(Bdb): @@ -638,5 +630,3 @@ def test(): t = Tdb() t.run('import bdb; bdb.foo(10)') - -# end

1 0

r86868 - python/branches/py3k/Doc/library/urllib.request.rst
by georg.brandl Nov. 29, 2010

Nov. 29, 2010

Author: georg.brandl Date: Mon Nov 29 15:53:15 2010 New Revision: 86868 Log: Fix heading style inconsistencies. Modified: python/branches/py3k/Doc/library/urllib.request.rst Modified: python/branches/py3k/Doc/library/urllib.request.rst ============================================================================== --- python/branches/py3k/Doc/library/urllib.request.rst (original) +++ python/branches/py3k/Doc/library/urllib.request.rst Mon Nov 29 15:53:15 2010 @@ -1,4 +1,4 @@ -:mod:`urllib.request` --- extensible library for opening URLs +:mod:`urllib.request` --- Extensible library for opening URLs ============================================================= .. module:: urllib.request @@ -1273,8 +1273,8 @@ -:mod:`urllib.response` --- Response classes used by urllib. -=========================================================== +:mod:`urllib.response` --- Response classes used by urllib +========================================================== .. module:: urllib.response :synopsis: Response classes used by urllib.

1 0

r86867 - python/branches/py3k/Doc/library/urllib.request.rst
by georg.brandl Nov. 29, 2010

Nov. 29, 2010

Author: georg.brandl Date: Mon Nov 29 15:50:54 2010 New Revision: 86867 Log: Fix indentation bug. Modified: python/branches/py3k/Doc/library/urllib.request.rst Modified: python/branches/py3k/Doc/library/urllib.request.rst ============================================================================== --- python/branches/py3k/Doc/library/urllib.request.rst (original) +++ python/branches/py3k/Doc/library/urllib.request.rst Mon Nov 29 15:50:54 2010 @@ -314,18 +314,19 @@ users for the required information on the controlling terminal. A subclass may override this method to support more appropriate behavior if needed. - The :class:`FancyURLopener` class offers one additional method that should be - overloaded to provide the appropriate behavior: + The :class:`FancyURLopener` class offers one additional method that should be + overloaded to provide the appropriate behavior: - .. method:: prompt_user_passwd(host, realm) + .. method:: prompt_user_passwd(host, realm) + + Return information needed to authenticate the user at the given host in the + specified security realm. The return value should be a tuple, ``(user, + password)``, which can be used for basic authentication. + + The implementation prompts for this information on the terminal; an application + should override this method to use an appropriate interaction model in the local + environment. - Return information needed to authenticate the user at the given host in the - specified security realm. The return value should be a tuple, ``(user, - password)``, which can be used for basic authentication. - - The implementation prompts for this information on the terminal; an application - should override this method to use an appropriate interaction model in the local - environment. .. class:: OpenerDirector()

1 0

r86866 - python/branches/release31-maint
by senthil.kumaran Nov. 29, 2010

Nov. 29, 2010

Author: senthil.kumaran Date: Mon Nov 29 13:48:01 2010 New Revision: 86866 Log: Blocked revisions 86864 via svnmerge ........ r86864 | senthil.kumaran | 2010-11-29 20:42:29 +0800 (Mon, 29 Nov 2010) | 3 lines Remove the comment used while testing. ........ Modified: python/branches/release31-maint/ (props changed)

1 0

r86865 - python/branches/release27-maint
by senthil.kumaran Nov. 29, 2010

Nov. 29, 2010

Author: senthil.kumaran Date: Mon Nov 29 13:47:45 2010 New Revision: 86865 Log: Blocked revisions 86864 via svnmerge ........ r86864 | senthil.kumaran | 2010-11-29 20:42:29 +0800 (Mon, 29 Nov 2010) | 3 lines Remove the comment used while testing. ........ Modified: python/branches/release27-maint/ (props changed)

1 0

r86864 - python/branches/py3k/Lib/pdb.py
by senthil.kumaran Nov. 29, 2010

Nov. 29, 2010

Author: senthil.kumaran Date: Mon Nov 29 13:42:29 2010 New Revision: 86864 Log: Remove the comment used while testing. Modified: python/branches/py3k/Lib/pdb.py Modified: python/branches/py3k/Lib/pdb.py ============================================================================== --- python/branches/py3k/Lib/pdb.py (original) +++ python/branches/py3k/Lib/pdb.py Mon Nov 29 13:42:29 2010 @@ -775,7 +775,6 @@ self.error(err) else: self.clear_bpbynumber(i) - #self.clear_break(bp.file, bp.line) self.message('Deleted %s' % bp) do_cl = do_clear # 'c' is already an abbreviation for 'continue'

1 0

r86863 - in python/branches/release27-maint: Doc/library/pdb.rst Lib/bdb.py Lib/test/test_pdb.py Misc/NEWS
by senthil.kumaran Nov. 29, 2010

Nov. 29, 2010

Author: senthil.kumaran Date: Mon Nov 29 13:41:03 2010 New Revision: 86863 Log: 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. ........ Modified: python/branches/release27-maint/ (props changed) python/branches/release27-maint/Doc/library/pdb.rst python/branches/release27-maint/Lib/bdb.py python/branches/release27-maint/Lib/test/test_pdb.py python/branches/release27-maint/Misc/NEWS Modified: python/branches/release27-maint/Doc/library/pdb.rst ============================================================================== --- python/branches/release27-maint/Doc/library/pdb.rst (original) +++ python/branches/release27-maint/Doc/library/pdb.rst Mon Nov 29 13:41:03 2010 @@ -239,7 +239,8 @@ Temporary breakpoint, which is removed automatically when it is first hit. The arguments are the same as break. -cl(ear) [*bpnumber* [*bpnumber ...*]] +cl(ear) [*filename:lineno* | *bpnumber* [*bpnumber ...*]] + With a *filename:lineno* argument, clear all the breakpoints at this line. With a space separated list of breakpoint numbers, clear those breakpoints. Without argument, clear all breaks (but first ask confirmation). Modified: python/branches/release27-maint/Lib/bdb.py ============================================================================== --- python/branches/release27-maint/Lib/bdb.py (original) +++ python/branches/release27-maint/Lib/bdb.py Mon Nov 29 13:41:03 2010 @@ -250,6 +250,12 @@ 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 @@ # 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 @@ 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) Modified: python/branches/release27-maint/Lib/test/test_pdb.py ============================================================================== --- python/branches/release27-maint/Lib/test/test_pdb.py (original) +++ python/branches/release27-maint/Lib/test/test_pdb.py Mon Nov 29 13:41:03 2010 @@ -54,6 +54,108 @@ (Pdb) continue """ +def test_pdb_breakpoint_commands(): + """Test basic commands related to breakpoints. + + >>> def test_function(): + ... import pdb; pdb.Pdb().set_trace() + ... print(1) + ... print(2) + ... print(3) + ... print(4) + + First, need to clear bdb state that might be left over from previous tests. + Otherwise, the new breakpoints might get assigned different numbers. + + >>> from bdb import Breakpoint + >>> Breakpoint.next = 1 + >>> Breakpoint.bplist = {} + >>> Breakpoint.bpbynumber = [None] + + Now test the breakpoint commands. NORMALIZE_WHITESPACE is needed because + the breakpoint list outputs a tab for the "stop only" and "ignore next" + lines, which we don't want to put in here. + + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE + ... 'break 3', + ... 'disable 1', + ... 'ignore 1 10', + ... 'condition 1 1 < 2', + ... 'break 4', + ... 'break 4', + ... 'break', + ... 'clear 3', + ... 'break', + ... 'condition 1', + ... 'enable 1', + ... 'clear 1', + ... 'commands 2', + ... 'print 42', + ... 'end', + ... 'continue', # will stop at breakpoint 2 (line 4) + ... 'clear', # clear all! + ... 'y', + ... 'tbreak 5', + ... 'continue', # will stop at temporary breakpoint + ... 'break', # make sure breakpoint is gone + ... 'continue', + ... ]): + ... test_function() + > <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>(3)test_function() + -> print(1) + (Pdb) break 3 + Breakpoint 1 at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:3 + (Pdb) disable 1 + (Pdb) ignore 1 10 + Will ignore next 10 crossings of breakpoint 1. + (Pdb) condition 1 1 < 2 + (Pdb) break 4 + Breakpoint 2 at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:4 + (Pdb) break 4 + Breakpoint 3 at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:4 + (Pdb) break + Num Type Disp Enb Where + 1 breakpoint keep no at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:3 + stop only if 1 < 2 + ignore next 10 hits + 2 breakpoint keep yes at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:4 + 3 breakpoint keep yes at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:4 + (Pdb) clear 3 + Deleted breakpoint 3 + (Pdb) break + Num Type Disp Enb Where + 1 breakpoint keep no at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:3 + stop only if 1 < 2 + ignore next 10 hits + 2 breakpoint keep yes at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:4 + (Pdb) condition 1 + Breakpoint 1 is now unconditional. + (Pdb) enable 1 + (Pdb) clear 1 + Deleted breakpoint 1 + (Pdb) commands 2 + (com) print 42 + (com) end + (Pdb) continue + 1 + 42 + > <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>(4)test_function() + -> print(2) + (Pdb) clear + Clear all breaks? y + (Pdb) tbreak 5 + Breakpoint 4 at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:5 + (Pdb) continue + 2 + Deleted breakpoint 4 + > <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>(5)test_function() + -> print(3) + (Pdb) break + (Pdb) continue + 3 + 4 + """ + def test_pdb_skip_modules(): """This illustrates the simple case of module skipping. @@ -138,6 +240,14 @@ ... print(3) ... print(4) + First, need to clear bdb state that might be left over from previous tests. + Otherwise, the new breakpoints might get assigned different numbers. + + >>> from bdb import Breakpoint + >>> Breakpoint.next = 1 + >>> Breakpoint.bplist = {} + >>> Breakpoint.bpbynumber = [None] + >>> with PdbTestInput([ ... 'next', ... 'break 7', Modified: python/branches/release27-maint/Misc/NEWS ============================================================================== --- python/branches/release27-maint/Misc/NEWS (original) +++ python/branches/release27-maint/Misc/NEWS Mon Nov 29 13:41:03 2010 @@ -28,6 +28,8 @@ - Issue #6098: Don't claim DOM level 3 conformance in minidom. +- Issue #10561: In pdb, clear the breakpoints by the breakpoint number. + - Issue #5762: Fix AttributeError raised by ``xml.dom.minidom`` when an empty XML namespace attribute is encountered.

1 0

r86862 - in python/branches/release31-maint: Doc/library/pdb.rst Lib/bdb.py Lib/test/test_pdb.py Misc/NEWS
by senthil.kumaran Nov. 29, 2010

Nov. 29, 2010

Author: senthil.kumaran Date: Mon Nov 29 13:27:45 2010 New Revision: 86862 Log: 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. ........ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Doc/library/pdb.rst python/branches/release31-maint/Lib/bdb.py python/branches/release31-maint/Lib/test/test_pdb.py python/branches/release31-maint/Misc/NEWS Modified: python/branches/release31-maint/Doc/library/pdb.rst ============================================================================== --- python/branches/release31-maint/Doc/library/pdb.rst (original) +++ python/branches/release31-maint/Doc/library/pdb.rst Mon Nov 29 13:27:45 2010 @@ -235,7 +235,8 @@ Temporary breakpoint, which is removed automatically when it is first hit. The arguments are the same as break. -cl(ear) [*bpnumber* [*bpnumber ...*]] +cl(ear) [*filename:lineno* | *bpnumber* [*bpnumber ...*]] + With a *filename:lineno* argument, clear all the breakpoints at this line. With a space separated list of breakpoint numbers, clear those breakpoints. Without argument, clear all breaks (but first ask confirmation). Modified: python/branches/release31-maint/Lib/bdb.py ============================================================================== --- python/branches/release31-maint/Lib/bdb.py (original) +++ python/branches/release31-maint/Lib/bdb.py Mon Nov 29 13:27:45 2010 @@ -249,6 +249,12 @@ 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: @@ -260,10 +266,7 @@ # 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: @@ -276,7 +279,8 @@ 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) Modified: python/branches/release31-maint/Lib/test/test_pdb.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_pdb.py (original) +++ python/branches/release31-maint/Lib/test/test_pdb.py Mon Nov 29 13:27:45 2010 @@ -54,6 +54,107 @@ (Pdb) continue """ +def test_pdb_breakpoint_commands(): + """Test basic commands related to breakpoints. + + >>> def test_function(): + ... import pdb; pdb.Pdb().set_trace() + ... print(1) + ... print(2) + ... print(3) + ... print(4) + + First, need to clear bdb state that might be left over from previous tests. + Otherwise, the new breakpoints might get assigned different numbers. + + >>> from bdb import Breakpoint + >>> Breakpoint.next = 1 + >>> Breakpoint.bplist = {} + >>> Breakpoint.bpbynumber = [None] + + Now test the breakpoint commands. NORMALIZE_WHITESPACE is needed because + the breakpoint list outputs a tab for the "stop only" and "ignore next" + lines, which we don't want to put in here. + + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE + ... 'break 3', + ... 'disable 1', + ... 'ignore 1 10', + ... 'condition 1 1 < 2', + ... 'break 4', + ... 'break 4', + ... 'break', + ... 'clear 3', + ... 'break', + ... 'condition 1', + ... 'enable 1', + ... 'clear 1', + ... 'commands 2', + ... 'print 42', + ... 'end', + ... 'continue', # will stop at breakpoint 2 (line 4) + ... 'clear', # clear all! + ... 'y', + ... 'tbreak 5', + ... 'continue', # will stop at temporary breakpoint + ... 'break', # make sure breakpoint is gone + ... 'continue', + ... ]): + ... test_function() + > <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>(3)test_function() + -> print(1) + (Pdb) break 3 + Breakpoint 1 at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:3 + (Pdb) disable 1 + (Pdb) ignore 1 10 + Will ignore next 10 crossings of breakpoint 1. + (Pdb) condition 1 1 < 2 + (Pdb) break 4 + Breakpoint 2 at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:4 + (Pdb) break 4 + Breakpoint 3 at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:4 + (Pdb) break + Num Type Disp Enb Where + 1 breakpoint keep no at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:3 + stop only if 1 < 2 + ignore next 10 hits + 2 breakpoint keep yes at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:4 + 3 breakpoint keep yes at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:4 + (Pdb) clear 3 + Deleted breakpoint 3 + (Pdb) break + Num Type Disp Enb Where + 1 breakpoint keep no at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:3 + stop only if 1 < 2 + ignore next 10 hits + 2 breakpoint keep yes at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:4 + (Pdb) condition 1 + Breakpoint 1 is now unconditional. + (Pdb) enable 1 + (Pdb) clear 1 + Deleted breakpoint 1 + (Pdb) commands 2 + (com) print 42 + (com) end + (Pdb) continue + 1 + 42 + > <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>(4)test_function() + -> print(2) + (Pdb) clear + Clear all breaks? y + (Pdb) tbreak 5 + Breakpoint 4 at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:5 + (Pdb) continue + 2 + Deleted breakpoint 4 + > <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>(5)test_function() + -> print(3) + (Pdb) break + (Pdb) continue + 3 + 4 + """ def test_pdb_skip_modules(): """This illustrates the simple case of module skipping. @@ -138,6 +239,14 @@ ... print(3) ... print(4) + First, need to clear bdb state that might be left over from previous tests. + Otherwise, the new breakpoints might get assigned different numbers. + + >>> from bdb import Breakpoint + >>> Breakpoint.next = 1 + >>> Breakpoint.bplist = {} + >>> Breakpoint.bpbynumber = [None] + >>> with PdbTestInput([ ... 'next', ... 'break 7', @@ -168,6 +277,7 @@ """ + def test_main(): from test import test_pdb support.run_doctest(test_pdb, verbosity=True) Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Mon Nov 29 13:27:45 2010 @@ -28,6 +28,8 @@ Library ------- +- Issue #10561: In pdb, clear the breakpoints by the breakpoint number. + - Issue #10459: Update CJK character names to Unicode 5.1. - Issue #10092: Properly reset locale in calendar.Locale*Calendar classes.

1 0

r86861 - in python/branches/py3k: Doc/library/pdb.rst Lib/bdb.py Lib/pdb.py Lib/test/test_pdb.py Misc/NEWS
by senthil.kumaran Nov. 29, 2010

Nov. 29, 2010

Author: senthil.kumaran Date: Mon Nov 29 12:54:17 2010 New Revision: 86861 Log: 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. Modified: python/branches/py3k/Doc/library/pdb.rst python/branches/py3k/Lib/bdb.py python/branches/py3k/Lib/pdb.py python/branches/py3k/Lib/test/test_pdb.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Doc/library/pdb.rst ============================================================================== --- python/branches/py3k/Doc/library/pdb.rst (original) +++ python/branches/py3k/Doc/library/pdb.rst Mon Nov 29 12:54:17 2010 @@ -256,8 +256,9 @@ Temporary breakpoint, which is removed automatically when it is first hit. The arguments are the same as for :pdbcmd:`break`. -.. pdbcommand:: cl(ear) [bpnumber [bpnumber ...]] +.. pdbcommand:: cl(ear) [filename:lineno | bpnumber [bpnumber ...]] + With a *filename:lineno* argument, clear all the breakpoints at this line. With a space separated list of breakpoint numbers, clear those breakpoints. Without argument, clear all breaks (but first ask confirmation). Modified: python/branches/py3k/Lib/bdb.py ============================================================================== --- python/branches/py3k/Lib/bdb.py (original) +++ python/branches/py3k/Lib/bdb.py Mon Nov 29 12:54:17 2010 @@ -252,6 +252,12 @@ 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: @@ -263,17 +269,15 @@ # 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: bp = self.get_bpbynumber(arg) except ValueError as err: return str(err) - 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) Modified: python/branches/py3k/Lib/pdb.py ============================================================================== --- python/branches/py3k/Lib/pdb.py (original) +++ python/branches/py3k/Lib/pdb.py Mon Nov 29 12:54:17 2010 @@ -774,7 +774,8 @@ except ValueError as err: self.error(err) else: - self.clear_break(bp.file, bp.line) + self.clear_bpbynumber(i) + #self.clear_break(bp.file, bp.line) self.message('Deleted %s' % bp) do_cl = do_clear # 'c' is already an abbreviation for 'continue' Modified: python/branches/py3k/Lib/test/test_pdb.py ============================================================================== --- python/branches/py3k/Lib/test/test_pdb.py (original) +++ python/branches/py3k/Lib/test/test_pdb.py Mon Nov 29 12:54:17 2010 @@ -192,6 +192,9 @@ ... 'ignore 1 10', ... 'condition 1 1 < 2', ... 'break 4', + ... 'break 4', + ... 'break', + ... 'clear 3', ... 'break', ... 'condition 1', ... 'enable 1', @@ -220,6 +223,17 @@ New condition set for breakpoint 1. (Pdb) break 4 Breakpoint 2 at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:4 + (Pdb) break 4 + Breakpoint 3 at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:4 + (Pdb) break + Num Type Disp Enb Where + 1 breakpoint keep no at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:3 + stop only if 1 < 2 + ignore next 10 hits + 2 breakpoint keep yes at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:4 + 3 breakpoint keep yes at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:4 + (Pdb) clear 3 + Deleted breakpoint 3 at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:4 (Pdb) break Num Type Disp Enb Where 1 breakpoint keep no at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:3 @@ -244,10 +258,10 @@ Clear all breaks? y Deleted breakpoint 2 at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:4 (Pdb) tbreak 5 - Breakpoint 3 at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:5 + Breakpoint 4 at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:5 (Pdb) continue 2 - Deleted breakpoint 3 at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:5 + Deleted breakpoint 4 at <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>:5 > <doctest test.test_pdb.test_pdb_breakpoint_commands[0]>(5)test_function() -> print(3) (Pdb) break Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Mon Nov 29 12:54:17 2010 @@ -49,6 +49,8 @@ - Issue #10242: Fixed implementation of unittest.ItemsEqual and gave it a new more informative name, unittest.CountEqual. +- Issue #10561: In pdb, clear the breakpoints by the breakpoint number. + - Issue #2986: difflib.SequenceMatcher gets a new parameter, autojunk, which can be set to False to turn off the previously undocumented 'popularity' heuristic. Patch by Terry Reedy and Eli Bendersky.

1 0

r86860 - python/branches/release27-maint
by ezio.melotti Nov. 29, 2010

Nov. 29, 2010

Author: ezio.melotti Date: Mon Nov 29 10:55:06 2010 New Revision: 86860 Log: Blocked revisions 86845,86855-86856 via svnmerge ........ r86845 | ezio.melotti | 2010-11-28 06:18:54 +0200 (Sun, 28 Nov 2010) | 1 line Add callable() to the built-in functions table. ........ r86855 | raymond.hettinger | 2010-11-29 03:38:25 +0200 (Mon, 29 Nov 2010) | 1 line Do not add an obsolete unittest name to Py3.2. ........ r86856 | ezio.melotti | 2010-11-29 04:02:10 +0200 (Mon, 29 Nov 2010) | 1 line Use assertCountEqual instead of assertItemsEqual ........ Modified: python/branches/release27-maint/ (props changed)

1 0