Update of /cvsroot/pywin32/pywin32/com/win32com/client
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4331/com/win32com/client
Modified Files:
Tag: py3k
dynamic.py genpy.py
Log Message:
merge various trunk changes
Index: genpy.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/genpy.py,v
retrieving revision 1.55.2.9
retrieving revision 1.55.2.10
diff -C2 -d -r1.55.2.9 -r1.55.2.10
*** genpy.py 14 Jan 2009 12:42:02 -0000 1.55.2.9
--- genpy.py 28 Jan 2009 11:29:52 -0000 1.55.2.10
***************
*** 491,495 ****
print("\t\t\treturn repr(self)", file=stream)
print("\tdef __str__(self, *args):", file=stream)
! print("\t\treturn str(self.__call__(*args))", file=stream)
print("\tdef __int__(self, *args):", file=stream)
print("\t\treturn int(self.__call__(*args))", file=stream)
--- 491,495 ----
print("\t\t\treturn repr(self)", file=stream)
print("\tdef __str__(self, *args):", file=stream)
! print("\t\treturn str(self.__unicode__(*args))", file=stream)
print("\tdef __int__(self, *args):", file=stream)
print("\t\treturn int(self.__call__(*args))", file=stream)
Index: dynamic.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/dynamic.py,v
retrieving revision 1.22.2.10
retrieving revision 1.22.2.11
diff -C2 -d -r1.22.2.10 -r1.22.2.11
*** dynamic.py 25 Jan 2009 04:52:20 -0000 1.22.2.10
--- dynamic.py 28 Jan 2009 11:29:52 -0000 1.22.2.11
***************
*** 74,79 ****
iunkType = pythoncom.TypeIIDs[pythoncom.IID_IUnknown]
! ## Py3k requires a tuple for isinstance
! _GoodDispatchTypes=(str, IIDType)
_defaultDispatchItem=build.DispatchItem
--- 74,78 ----
iunkType = pythoncom.TypeIIDs[pythoncom.IID_IUnknown]
! _GoodDispatchTypes=(str, IIDType, str)
_defaultDispatchItem=build.DispatchItem
|