[pywin32-checkins] pywin32/com/win32com/client combrowse.py, 1.8.2.6, 1.8.2.7

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32com/client
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18812

Modified Files:
      Tag: py3k
	combrowse.py 
Log Message:
Don't encode object names, use key function for sorting

Index: combrowse.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/combrowse.py,v
retrieving revision 1.8.2.6
retrieving revision 1.8.2.7
diff -C2 -d -r1.8.2.6 -r1.8.2.7
*** combrowse.py	9 Dec 2008 13:10:15 -0000	1.8.2.6
--- combrowse.py	10 Dec 2008 06:36:01 -0000	1.8.2.7
***************
*** 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)
***************
*** 209,213 ****
              if extraDescs: extraDesc = " (%s)" % ", ".join(extraDescs)
              ret.append(HLITypeLib(fname, "Type Library" + extraDesc))
!         ret.sort()
          return ret
  
--- 209,213 ----
              if extraDescs: extraDesc = " (%s)" % ", ".join(extraDescs)
              ret.append(HLITypeLib(fname, "Type Library" + extraDesc))
!         ret.sort(key=lambda k:k.GetText())
          return ret
  
***************
*** 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]:
***************
*** 468,472 ****
              except pythoncom.com_error:
                  ret.append(browser.MakeHLI("The type info can not be loaded!"))
!         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
  
***************
*** 514,518 ****
              win32api.RegCloseKey(key)
              win32ui.DoWaitCursor(0)
!         ret.sort()
          return ret
  
--- 514,518 ----
              win32api.RegCloseKey(key)
              win32ui.DoWaitCursor(0)
!         ret.sort(key=lambda k:k.GetText())
          return ret