[pywin32-checkins] pywin32/com/win32comext/adsi __init__.py, 1.2.4.1, 1.2.4.2

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/adsi
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27962/com/win32comext/adsi

Modified Files:
      Tag: py3k
	__init__.py 
Log Message:
merge recent UnicodeType, string module and NeedUnicodeConversions changes from trunk

Index: __init__.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/adsi/__init__.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
*** __init__.py	26 Nov 2008 09:03:29 -0000	1.2.4.1
--- __init__.py	4 Dec 2008 05:08:41 -0000	1.2.4.2
***************
*** 67,75 ****
  
  class ADSIDispatch(win32com.client.CDispatch):
! 	def _wrap_dispatch_(self, ob, userName = None, returnCLSID = None, UnicodeToString = win32com.client.NeedUnicodeConversions):
  		if not userName:
  			userName = "ADSI-object"
  		olerepr = win32com.client.dynamic.MakeOleRepr(ob, None, None)
! 		return ADSIDispatch(ob, olerepr, userName, UnicodeToString = UnicodeToString)
  
  	def _NewEnum(self):
--- 67,76 ----
  
  class ADSIDispatch(win32com.client.CDispatch):
! 	def _wrap_dispatch_(self, ob, userName = None, returnCLSID = None, UnicodeToString=None):
! 		assert UnicodeToString is None, "this is deprectated and will be removed"
  		if not userName:
  			userName = "ADSI-object"
  		olerepr = win32com.client.dynamic.MakeOleRepr(ob, None, None)
! 		return ADSIDispatch(ob, olerepr, userName)
  
  	def _NewEnum(self):