[pywin32-checkins] pywin32/Pythonwin/pywin/mfc activex.py, 1.3.4.3, 1.3.4.4 dialog.py, 1.3.4.3, 1.3.4.4

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

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

Modified Files:
      Tag: py3k
	activex.py dialog.py 
Log Message:
merge various fixes and cleanups from bzr integration branch

Index: activex.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/mfc/activex.py,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -C2 -d -r1.3.4.3 -r1.3.4.4
*** activex.py	27 Nov 2008 11:31:03 -0000	1.3.4.3
--- activex.py	3 Jan 2009 04:45:17 -0000	1.3.4.4
***************
*** 1,6 ****
  """Support for ActiveX control hosting in Pythonwin.
  """
! import win32ui, win32uiole, window
! import new
  
  class Control(window.Wnd):
--- 1,12 ----
  """Support for ActiveX control hosting in Pythonwin.
  """
! import win32ui, win32uiole
! from . import window
! # XXX - we are still "classic style" classes in py2x, so we need can't yet
! # use 'type()' everywhere - revisit soon, as py2x will move to new-style too...
! try:
! 	from types import ClassType as new_type
! except ImportError:
! 	new_type = type # py3k
  
  class Control(window.Wnd):
***************
*** 62,66 ****
  	if name is None:
  		name = controlClass.__name__
! 	return new.classobj("OCX" + name, (Control, controlClass), {})
  
  def MakeControlInstance( controlClass, name = None ):
--- 68,72 ----
  	if name is None:
  		name = controlClass.__name__
! 	return new_type("OCX" + name, (Control, controlClass), {})
  
  def MakeControlInstance( controlClass, name = None ):

Index: dialog.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/mfc/dialog.py,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -C2 -d -r1.3.4.3 -r1.3.4.4
*** dialog.py	6 Dec 2008 01:48:26 -0000	1.3.4.3
--- dialog.py	3 Jan 2009 04:45:17 -0000	1.3.4.4
***************
*** 69,72 ****
--- 69,73 ----
  	def items(self): return list(self.data.items())
  	def values(self): return list(self.data.values())
+ 	# XXX - needs py3k work!
  	def has_key(self, key): return key in self.data