[Python-checkins] python/dist/src/Lib pdb.py,1.51.24.4,1.51.24.5

akuchling@users.sourceforge.net akuchling@users.sourceforge.net
Thu, 22 May 2003 10:25:24 -0700


Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv10049

Modified Files:
      Tag: release22-maint
	pdb.py 
Log Message:
Backport fix for SF bug #741171: pdb crashes when enabling a non-existing breakpoint

Index: pdb.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pdb.py,v
retrieving revision 1.51.24.4
retrieving revision 1.51.24.5
diff -C2 -d -r1.51.24.4 -r1.51.24.5
*** pdb.py	13 Jan 2003 21:16:24 -0000	1.51.24.4
--- pdb.py	22 May 2003 17:25:21 -0000	1.51.24.5
***************
*** 368,372 ****
          args = arg.split()
          for i in args:
!             bp = bdb.Breakpoint.bpbynumber[int(i)]
              if bp:
                  bp.enable()
--- 368,382 ----
          args = arg.split()
          for i in args:
!             try:
!                 i = int(i)
!             except ValueError:
!                 print 'Breakpoint index %r is not a number' % i
!                 continue
! 
!             if not (0 <= i < len(bdb.Breakpoint.bpbynumber)):
!                 print 'No breakpoint numbered', i
!                 continue
! 
!             bp = bdb.Breakpoint.bpbynumber[i]
              if bp:
                  bp.enable()
***************
*** 375,379 ****
          args = arg.split()
          for i in args:
!             bp = bdb.Breakpoint.bpbynumber[int(i)]
              if bp:
                  bp.disable()
--- 385,399 ----
          args = arg.split()
          for i in args:
!             try:
!                 i = int(i)
!             except ValueError:
!                 print 'Breakpoint index %r is not a number' % i
!                 continue
!             
!             if not (0 <= i < len(bdb.Breakpoint.bpbynumber)):
!                 print 'No breakpoint numbered', i
!                 continue
! 
!             bp = bdb.Breakpoint.bpbynumber[i]
              if bp:
                  bp.disable()