[pywin32-checkins] pywin32/Pythonwin/pywin/Demos/app customprint.py, 1.3.2.1, 1.3.2.2 dlgappdemo.py, 1.2.4.1, 1.2.4.2

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

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

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

Index: dlgappdemo.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/app/dlgappdemo.py,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -C2 -d -r1.2.4.1 -r1.2.4.2
*** dlgappdemo.py	29 Aug 2008 06:16:05 -0000	1.2.4.1
--- dlgappdemo.py	26 Nov 2008 07:17:38 -0000	1.2.4.2
***************
*** 45,47 ****
  	from . import demoutils
  	demoutils.NeedApp()
- 	
\ No newline at end of file
--- 45,46 ----

Index: customprint.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/app/customprint.py,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -d -r1.3.2.1 -r1.3.2.2
*** customprint.py	29 Aug 2008 06:16:05 -0000	1.3.2.1
--- customprint.py	26 Nov 2008 07:17:38 -0000	1.3.2.2
***************
*** 34,38 ****
                         }
          self.pens = {}
!         for name, color in list(self.colors.items()):
              self.pens[name] = win32ui.CreatePen(win32con.PS_SOLID,
                                                   5, color)
--- 34,38 ----
                         }
          self.pens = {}
!         for name, color in self.colors.iteritems():
              self.pens[name] = win32ui.CreatePen(win32con.PS_SOLID,
                                                   5, color)