[pywin32-checkins] pywin32/com/win32com/client selecttlb.py, 1.10.2.1, 1.10.2.2

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

Update of /cvsroot/pywin32/pywin32/com/win32com/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1005

Modified Files:
      Tag: py3k
	selecttlb.py 
Log Message:
Remove string moduel, use sort key

Index: selecttlb.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/selecttlb.py,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -C2 -d -r1.10.2.1 -r1.10.2.2
*** selecttlb.py	29 Aug 2008 08:58:53 -0000	1.10.2.1
--- selecttlb.py	31 Aug 2008 18:22:15 -0000	1.10.2.2
***************
*** 2,6 ****
  """
  
! import win32api, win32con, string, pythoncom
  
  class TypelibSpec:
--- 2,6 ----
  """
  
! import win32api, win32con, pythoncom
  
  class TypelibSpec:
***************
*** 24,30 ****
  		raise IndexError("Cant index me!")
  	def __cmp__(self, other):
! 		rc = cmp(string.lower(self.ver_desc or ""), string.lower(other.ver_desc or ""))
  		if rc==0:
! 			rc = cmp(string.lower(self.desc), string.lower(other.desc))
  		if rc==0:
  			rc = cmp(self.major, other.major)
--- 24,30 ----
  		raise IndexError("Cant index me!")
  	def __cmp__(self, other):
! 		rc = cmp((self.ver_desc or "").lower(), (other.ver_desc or "").lower())
  		if rc==0:
! 			rc = cmp(self.desc.lower(), other.desc.lower())
  		if rc==0:
  			rc = cmp(self.major, other.major)
***************
*** 85,89 ****
  			continue
  		for version, tlbdesc in EnumKeys(key2):
! 			major_minor = string.split(version, '.', 1)
  			if len(major_minor) < 2:
  				major_minor.append('0')
--- 85,89 ----
  			continue
  		for version, tlbdesc in EnumKeys(key2):
! 			major_minor = version.split('.', 1)
  			if len(major_minor) < 2:
  				major_minor.append('0')
***************
*** 139,142 ****
--- 139,145 ----
  	return ret
  
+ def tlb_sort_key(tlb_item):
+ 	return tlb_item.ver_desc
+ 
  def SelectTlb(title="Select Library", excludeFlags = 0):
  	"""Display a list of all the type libraries, and select one.   Returns None if cancelled
***************
*** 148,152 ****
  		i.major = int(i.major, 16)
  		i.minor = int(i.minor, 16)
! 	items.sort()
  	rc = pywin.dialogs.list.SelectFromLists(title, items, ["Type Library"])
  	if rc is None:
--- 151,155 ----
  		i.major = int(i.major, 16)
  		i.minor = int(i.minor, 16)
! 	items.sort(key=tlb_sort_key)
  	rc = pywin.dialogs.list.SelectFromLists(title, items, ["Type Library"])
  	if rc is None: