Update of /cvsroot/pywin32/pywin32/com/win32com/client
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24579/com/win32com/client
Modified Files:
Tag: py3k
build.py combrowse.py dynamic.py
Log Message:
merge recent changes from the trunk
Index: combrowse.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/combrowse.py,v
retrieving revision 1.8.2.7
retrieving revision 1.8.2.8
diff -C2 -d -r1.8.2.7 -r1.8.2.8
*** combrowse.py 10 Dec 2008 06:36:01 -0000 1.8.2.7
--- combrowse.py 25 Jan 2009 04:52:20 -0000 1.8.2.8
***************
*** 209,213 ****
if extraDescs: extraDesc = " (%s)" % ", ".join(extraDescs)
ret.append(HLITypeLib(fname, "Type Library" + extraDesc))
! ret.sort(key=lambda k:k.GetText())
return ret
--- 209,213 ----
if extraDescs: extraDesc = " (%s)" % ", ".join(extraDescs)
ret.append(HLITypeLib(fname, "Type Library" + extraDesc))
! ret.sort()
return ret
***************
*** 468,472 ****
except pythoncom.com_error:
ret.append(browser.MakeHLI("The type info can not be loaded!"))
! ret.sort(key=lambda k:k.GetText())
return ret
--- 468,472 ----
except pythoncom.com_error:
ret.append(browser.MakeHLI("The type info can not be loaded!"))
! ret.sort()
return ret
***************
*** 514,518 ****
win32api.RegCloseKey(key)
win32ui.DoWaitCursor(0)
! ret.sort(key=lambda k:k.GetText())
return ret
--- 514,518 ----
win32api.RegCloseKey(key)
win32ui.DoWaitCursor(0)
! ret.sort()
return ret
Index: dynamic.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/dynamic.py,v
retrieving revision 1.22.2.9
retrieving revision 1.22.2.10
diff -C2 -d -r1.22.2.9 -r1.22.2.10
*** dynamic.py 8 Jan 2009 03:45:49 -0000 1.22.2.9
--- dynamic.py 25 Jan 2009 04:52:20 -0000 1.22.2.10
***************
*** 95,103 ****
if isinstance(IDispatch, str):
userName = IDispatch
! ## elif type(IDispatch) == UnicodeType:
! ## # We always want the displayed name to be a real string
! ## userName = IDispatch.encode("ascii", "replace")
! elif not isinstance(userName, str):
!
userName = str(userName)
return (_GetGoodDispatch(IDispatch, clsctx), userName)
--- 95,105 ----
if isinstance(IDispatch, str):
userName = IDispatch
! elif isinstance(IDispatch, str):
! # We always want the displayed name to be a real string
! userName = IDispatch.encode("ascii", "replace")
! elif type(userName) == str:
! # As above - always a string...
! userName = userName.encode("ascii", "replace")
! else:
userName = str(userName)
return (_GetGoodDispatch(IDispatch, clsctx), userName)
Index: build.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/build.py,v
retrieving revision 1.31.2.8
retrieving revision 1.31.2.9
diff -C2 -d -r1.31.2.8 -r1.31.2.9
*** build.py 14 Jan 2009 12:42:02 -0000 1.31.2.8
--- build.py 25 Jan 2009 04:52:20 -0000 1.31.2.9
***************
*** 390,399 ****
assert typeinfo is not None, "Cant build vtables without type info!"
- def cmp_vtable_off(m1):
- return m1.desc[7]
-
meth_list = list(self.mapFuncs.values()) + list(self.propMapGet.values()) + list(self.propMapPut.values())
! meth_list.sort(key = cmp_vtable_off )
# Now turn this list into the run-time representation
# (ready for immediate use or writing to gencache)
--- 390,402 ----
assert typeinfo is not None, "Cant build vtables without type info!"
meth_list = list(self.mapFuncs.values()) + list(self.propMapGet.values()) + list(self.propMapPut.values())
! if sys.version_info < (2,4):
! def cmp_vtable_off(m1, m2):
! return cmp(m1.desc[7], m2.desc[7])
! meth_list.sort(cmp_vtable_off)
! else:
! meth_list.sort(key=lambda m: m.desc[7])
!
# Now turn this list into the run-time representation
# (ready for immediate use or writing to gencache)
|