[pywin32-checkins] pywin32/Pythonwin/pywin/Demos dlgtest.py, 1.1.4.1, 1.1.4.2 objdoc.py, 1.1.4.1, 1.1.4.2

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

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

Modified Files:
      Tag: py3k
	dlgtest.py objdoc.py 
Log Message:
merge various py3k friendly changes from the trunk.


Index: dlgtest.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/dlgtest.py,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -C2 -d -r1.1.4.1 -r1.1.4.2
*** dlgtest.py	29 Aug 2008 06:16:06 -0000	1.1.4.1
--- dlgtest.py	23 Oct 2008 09:45:16 -0000	1.1.4.2
***************
*** 22,26 ****
  	def __init__(self, modal=1):
  		dialog.Dialog.__init__(self, IDD_SET_TABSTOPS)
- 
  		self.counter=0
  		if modal:
--- 22,25 ----
***************
*** 28,32 ****
  		else:
  			self.CreateWindow()
! 		
  	def OnInitDialog(self):
  		# Set the caption of the dialog itself.
--- 27,31 ----
  		else:
  			self.CreateWindow()
! 
  	def OnInitDialog(self):
  		# Set the caption of the dialog itself.

Index: objdoc.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/objdoc.py,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -C2 -d -r1.1.4.1 -r1.1.4.2
*** objdoc.py	29 Aug 2008 06:16:06 -0000	1.1.4.1
--- objdoc.py	23 Oct 2008 09:45:16 -0000	1.1.4.2
***************
*** 32,36 ****
  		self.object = object
  	def OnOpenDocument (self, name):
! 		raise error("Should not be called if template strings set up correctly")
  		return 0
  
--- 32,36 ----
  		self.object = object
  	def OnOpenDocument (self, name):
! 		raise RuntimeError("Should not be called if template strings set up correctly")
  		return 0