Index: bdb.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bdb.py,v
retrieving revision 1.42
diff -c -r1.42 bdb.py
*** bdb.py	27 Feb 2003 20:14:32 -0000	1.42
--- bdb.py	20 Sep 2003 19:43:02 -0000
***************
*** 266,274 ****
          self.breaks = {}
  
      def get_break(self, filename, lineno):
!         filename = self.canonic(filename)
!         return filename in self.breaks and \
!             lineno in self.breaks[filename]
  
      def get_breaks(self, filename, lineno):
          filename = self.canonic(filename)
--- 266,275 ----
          self.breaks = {}
  
      def get_break(self, filename, lineno):
!         bplist = self.get_breaks( filename, lineno )
!         if len( bplist ):
!             return bplist[-1]
!         return None
  
      def get_breaks(self, filename, lineno):
          filename = self.canonic(filename)
***************
*** 276,281 ****
--- 277,294 ----
              lineno in self.breaks[filename] and \
              Breakpoint.bplist[filename, lineno] or []
  
+     def get_bpbynumber(self, arg):
+         # duplicates logic from clear_bpbynumber
+         try:
+             number = int(arg)
+         except:
+             return None
+         try:
+             bp = Breakpoint.bpbynumber[number]
+         except IndexError:
+             return None
+         return bp
+     
      def get_file_breaks(self, filename):
          filename = self.canonic(filename)
          if filename in self.breaks:
Index: pdb.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pdb.py,v
retrieving revision 1.66
diff -c -r1.66 pdb.py
*** pdb.py	15 Jun 2003 23:26:29 -0000	1.66
--- pdb.py	20 Sep 2003 19:43:02 -0000
***************
*** 388,393 ****
--- 388,394 ----
              bp = bdb.Breakpoint.bpbynumber[i]
              if bp:
                  bp.enable()
+                 print 'Enabled breakpoint %s at %s:%s' % (i, bp.file, bp.line)
  
      def do_disable(self, arg):
          args = arg.split()
***************
*** 405,410 ****
--- 406,412 ----
              bp = bdb.Breakpoint.bpbynumber[i]
              if bp:
                  bp.disable()
+                 print 'Disabled breakpoint %s at %s:%s' % (i, bp.file, bp.line)
  
      def do_condition(self, arg):
          # arg is breakpoint number and condition
***************
*** 467,482 ****
              except:
                  err = "Invalid line number (%s)" % arg
              else:
                  err = self.clear_break(filename, lineno)
              if err: print '***', err
              return
          numberlist = arg.split()
          for i in numberlist:
              err = self.clear_bpbynumber(i)
              if err:
                  print '***', err
              else:
!                 print 'Deleted breakpoint %s ' % (i,)
      do_cl = do_clear # 'c' is already an abbreviation for 'continue'
  
      def do_where(self, arg):
--- 469,488 ----
              except:
                  err = "Invalid line number (%s)" % arg
              else:
+                 bp = self.get_break(filename, lineno)
                  err = self.clear_break(filename, lineno)
              if err: print '***', err
+             else:
+                 print 'Deleted breakpoint %s at %s:%s' % (i, bp.file, bp.line)
              return
          numberlist = arg.split()
          for i in numberlist:
+             bp = self.get_bpbynumber(i)
              err = self.clear_bpbynumber(i)
              if err:
                  print '***', err
              else:
!                 print 'Deleted breakpoint %s at %s:%s' % (i, bp.file, bp.line)
      do_cl = do_clear # 'c' is already an abbreviation for 'continue'
  
      def do_where(self, arg):