Update of /cvsroot/pywin32/pywin32/com/win32com/client
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv813/com/win32com/client
Modified Files:
combrowse.py
Log Message:
Don't convert unicode to string in the COM browser
Index: combrowse.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/combrowse.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** combrowse.py 6 Dec 2008 00:41:13 -0000 1.12
--- combrowse.py 11 Dec 2008 06:54:52 -0000 1.13
***************
*** 50,54 ****
if name is None:
try:
! name = pythoncom.ProgIDFromCLSID(myobject).encode('mbcs')
except pythoncom.com_error:
name = str(myobject)
--- 50,54 ----
if name is None:
try:
! name = pythoncom.ProgIDFromCLSID(myobject)
except pythoncom.com_error:
name = str(myobject)
***************
*** 263,267 ****
typeinfo = typelib.GetTypeInfo(index)
self.id = typeinfo.GetVarDesc(index)[0]
! name = typeinfo.GetNames(self.id)[0].encode('mbcs')
HLITypeLibEntry.__init__(self, myitem, name)
def GetText(self):
--- 263,267 ----
typeinfo = typelib.GetTypeInfo(index)
self.id = typeinfo.GetVarDesc(index)[0]
! name = typeinfo.GetNames(self.id)[0]
HLITypeLibEntry.__init__(self, myitem, name)
def GetText(self):
***************
*** 274,278 ****
for j in range(attr[7]):
vdesc = typeinfo.GetVarDesc(j)
! name = typeinfo.GetNames(vdesc[0])[0].encode('mbcs')
ret.append(browser.MakeHLI(vdesc[1], name))
return ret
--- 274,278 ----
for j in range(attr[7]):
vdesc = typeinfo.GetVarDesc(j)
! name = typeinfo.GetNames(vdesc[0])[0]
ret.append(browser.MakeHLI(vdesc[1], name))
return ret
***************
*** 282,286 ****
typeinfo, index = myitem
self.id = typeinfo.GetVarDesc(index)[0]
! name = typeinfo.GetNames(self.id)[0].encode('mbcs')
HLICOM.__init__(self, myitem, name)
def GetText(self):
--- 282,286 ----
typeinfo, index = myitem
self.id = typeinfo.GetVarDesc(index)[0]
! name = typeinfo.GetNames(self.id)[0]
HLICOM.__init__(self, myitem, name)
def GetText(self):
***************
*** 372,376 ****
typeinfo, index = myitem
self.id = typeinfo.GetFuncDesc(index)[0]
! name = typeinfo.GetNames(self.id)[0].encode('mbcs')
HLICOM.__init__(self, myitem, name)
def GetText(self):
--- 372,376 ----
typeinfo, index = myitem
self.id = typeinfo.GetFuncDesc(index)[0]
! name = typeinfo.GetNames(self.id)[0]
HLICOM.__init__(self, myitem, name)
def GetText(self):
***************
*** 402,406 ****
ret.append(browser.MakeHLI(self.id, "Dispatch ID"))
if len(names)>1:
! ret.append(browser.MakeHLI(", ".join(names[1:]).encode('mbcs'), "Named Params"))
fd = typeinfo.GetFuncDesc(index)
if fd[1]:
--- 402,406 ----
ret.append(browser.MakeHLI(self.id, "Dispatch ID"))
if len(names)>1:
! ret.append(browser.MakeHLI(", ".join(names[1:]), "Named Params"))
fd = typeinfo.GetFuncDesc(index)
if fd[1]:
|
