[pywin32-checkins] pywin32/Pythonwin/pywin/mfc activex.py, 1.3.4.1, 1.3.4.2 dialog.py, 1.3.4.1, 1.3.4.2 window.py, 1.2.4.1, 1.2.4.2

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

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

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

Index: window.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/mfc/window.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
*** window.py	29 Aug 2008 06:16:42 -0000	1.2.4.1
--- window.py	26 Nov 2008 07:17:39 -0000	1.2.4.2
***************
*** 1,2 ****
--- 1,3 ----
+ # The MFCish window classes.
  from . import object
  import win32ui

Index: activex.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/mfc/activex.py,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -C2 -d -r1.3.4.1 -r1.3.4.2
*** activex.py	29 Aug 2008 06:16:42 -0000	1.3.4.1
--- activex.py	26 Nov 2008 07:17:38 -0000	1.3.4.2
***************
*** 29,33 ****
  	def HookOleEvents(self):
  		dict = self._GetEventMap()
! 		for dispid, methodName in list(dict.items()):
  			if hasattr(self, methodName):
  				self._obj_.HookOleEvent( getattr(self, methodName), dispid )
--- 29,33 ----
  	def HookOleEvents(self):
  		dict = self._GetEventMap()
! 		for dispid, methodName in dict.iteritems():
  			if hasattr(self, methodName):
  				self._obj_.HookOleEvent( getattr(self, methodName), dispid )

Index: dialog.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/mfc/dialog.py,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -C2 -d -r1.3.4.1 -r1.3.4.2
*** dialog.py	29 Aug 2008 06:16:42 -0000	1.3.4.1
--- dialog.py	26 Nov 2008 07:17:39 -0000	1.3.4.2
***************
*** 7,11 ****
  import win32ui
  import win32con
! from . import window
  
  def dllFromDll(dllid):
--- 7,12 ----
  import win32ui
  import win32con
! # sob - 2to3 doesn't see this as a relative import :(
! from pywin.mfc import window
  
  def dllFromDll(dllid):
***************
*** 61,65 ****
  	# Make a dialog object look like a dictionary for the DDX support
  	def __bool__(self):
! 		return 1
  	def __len__(self): return len(self.data)
  	def __getitem__(self, key): return self.data[key]
--- 62,66 ----
  	# Make a dialog object look like a dictionary for the DDX support
  	def __bool__(self):
! 		return True
  	def __len__(self): return len(self.data)
  	def __getitem__(self, key): return self.data[key]