[pywin32-checkins] pywin32/Pythonwin/pywin/debugger debugger.py, 1.17.2.3, 1.17.2.4

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/debugger
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14888/Pythonwin/pywin/debugger

Modified Files:
      Tag: py3k
	debugger.py 
Log Message:
Merge various changes from trunk and py3k-integration bzr branch

Index: debugger.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/debugger/debugger.py,v
retrieving revision 1.17.2.3
retrieving revision 1.17.2.4
diff -C2 -d -r1.17.2.3 -r1.17.2.4
*** debugger.py	4 Sep 2008 20:53:56 -0000	1.17.2.3
--- debugger.py	26 Nov 2008 07:17:38 -0000	1.17.2.4
***************
*** 312,316 ****
  
  		from bdb import Breakpoint
! 		for bplist in list(Breakpoint.bplist.values()):
  			for bp in bplist:
  				if id(bp)==item_id:
--- 312,316 ----
  
  		from bdb import Breakpoint
! 		for bplist in Breakpoint.bplist.itervalues():
  			for bp in bplist:
  				if id(bp)==item_id:
***************
*** 326,330 ****
  			item_id = self.GetItem(num)[6]
  			from bdb import Breakpoint
! 			for bplist in list(Breakpoint.bplist.values()):
  				for bp in bplist:
  					if id(bp)==item_id:
--- 326,330 ----
  			item_id = self.GetItem(num)[6]
  			from bdb import Breakpoint
! 			for bplist in Breakpoint.bplist.itervalues():
  				for bp in bplist:
  					if id(bp)==item_id:
***************
*** 340,344 ****
  		index = -1
  		from bdb import Breakpoint
! 		for bplist in list(Breakpoint.bplist.values()):
  			for bp in bplist:
  				baseName = os.path.split(bp.file)[1]
--- 340,344 ----
  		index = -1
  		from bdb import Breakpoint
! 		for bplist in Breakpoint.bplist.itervalues():
  			for bp in bplist:
  				baseName = os.path.split(bp.file)[1]
***************
*** 600,608 ****
  			return 0
  		if frame is self.botframe and self.skipBotFrame == SKIP_RUN:
- 			print ('skip SKIP_RUN')
  			self.set_continue()
  			return 0
  		if frame is self.botframe and self.skipBotFrame == SKIP_STEP:
- 			print ('skip SKIP_STEP')
  			self.set_step()
  			return 0
--- 600,606 ----