[pywin32-checkins] pywin32/Pythonwin/pywin/tools browser.py, 1.10.2.6, 1.10.2.7 hierlist.py, 1.7.2.4, 1.7.2.5

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4460/Pythonwin/pywin/tools

Modified Files:
      Tag: py3k
	browser.py hierlist.py 
Log Message:
merge lots of changes from the trunk

Index: hierlist.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools/hierlist.py,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -C2 -d -r1.7.2.4 -r1.7.2.5
*** hierlist.py	5 Jan 2009 12:51:26 -0000	1.7.2.4
--- hierlist.py	14 Jan 2009 12:42:02 -0000	1.7.2.5
***************
*** 314,323 ****
  		return None	# same as other
  	# for py3k/rich-comp sorting compatibility.
! 	def __cmp__(self):
  		# this is always overridden, but to be sure...
  		return cmp(id(self), id(other))
  	def __lt__(self, other):
  		try:
! 			return self.__cmp__(self, other) < 0
  		except TypeError:
  			# we want unrelated items to be sortable...
--- 314,323 ----
  		return None	# same as other
  	# for py3k/rich-comp sorting compatibility.
! 	def __cmp__(self, other):
  		# this is always overridden, but to be sure...
  		return cmp(id(self), id(other))
  	def __lt__(self, other):
  		try:
! 			return self.__cmp__(other) < 0
  		except TypeError:
  			# we want unrelated items to be sortable...
***************
*** 326,330 ****
  	def __eq__(self, other):
  		try:
! 			return __cmp__(self, other) == 0
  		except TypeError:
  			# unrelated items compare false
--- 326,330 ----
  	def __eq__(self, other):
  		try:
! 			return self.__cmp__(other) == 0
  		except TypeError:
  			# unrelated items compare false

Index: browser.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools/browser.py,v
retrieving revision 1.10.2.6
retrieving revision 1.10.2.7
diff -C2 -d -r1.10.2.6 -r1.10.2.7
*** browser.py	5 Jan 2009 12:51:26 -0000	1.10.2.6
--- browser.py	14 Jan 2009 12:42:02 -0000	1.10.2.7
***************
*** 206,211 ****
  		except AttributeError:
  			pass
! 		ret.append( MakeHLI( self.myobject.__code__, "Code" ))
! 		ret.append( MakeHLI( self.myobject.__globals__, "Globals" ))
  		self.InsertDocString(ret)
  		return ret
--- 206,218 ----
  		except AttributeError:
  			pass
! 		try:
! 			code = self.myobject.__code__
! 			globs = self.myobject.__globals__
! 		except AttributeError:
! 			# must be py2.5 or earlier...
! 			code = self.myobject.func_code
! 			globs = self.myobject.func_globals
! 		ret.append(MakeHLI(code, "Code" ))
! 		ret.append(MakeHLI(globs, "Globals" ))
  		self.InsertDocString(ret)
  		return ret