[pywin32-checkins] pywin32/Pythonwin/pywin/framework/editor ModuleBrowser.py, 1.8.4.4, 1.8.4.5 document.py, 1.11.2.2, 1.11.2.3

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

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4261/Pythonwin/pywin/framework/editor

Modified Files:
      Tag: py3k
	ModuleBrowser.py document.py 
Log Message:
merge lots of changes (most via 2to3) from the trunk

Index: document.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor/document.py,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -C2 -d -r1.11.2.2 -r1.11.2.3
*** document.py	2 Oct 2008 13:06:36 -0000	1.11.2.2
--- document.py	5 Jan 2009 12:51:26 -0000	1.11.2.3
***************
*** 36,41 ****
  		self.scModuleName=GetEditorOption("Source Control Module", "")
  		self.scModule = None # Loaded when first used.
! 		# Skip the direct parent
! 		object.CmdTarget.__init__(self, template.CreateWin32uiDocument())
  
  	def OnCloseDocument(self ):
--- 36,40 ----
  		self.scModuleName=GetEditorOption("Source Control Module", "")
  		self.scModule = None # Loaded when first used.
! 		ParentEditorDocument.__init__(self, template, template.CreateWin32uiDocument())
  
  	def OnCloseDocument(self ):

Index: ModuleBrowser.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor/ModuleBrowser.py,v
retrieving revision 1.8.4.4
retrieving revision 1.8.4.5
diff -C2 -d -r1.8.4.4 -r1.8.4.5
*** ModuleBrowser.py	4 Dec 2008 07:32:05 -0000	1.8.4.4
--- ModuleBrowser.py	5 Jan 2009 12:51:26 -0000	1.8.4.5
***************
*** 24,28 ****
              else:
                  ret.append(HierListCLBRClass( item) )
!         ret.sort(key=lambda i:i.GetText())
          return ret
      def IsExpandable(self):
--- 24,28 ----
              else:
                  ret.append(HierListCLBRClass( item) )
!         ret.sort()
          return ret
      def IsExpandable(self):
***************
*** 79,83 ****
          for meth, lineno in self.methods.items():
              r2.append(HierListCLBRMethod(meth, self.file, lineno))
!         r2.sort(key=lambda m:m.GetText())
          return r1+r2
      def IsExpandable(self):
--- 79,83 ----
          for meth, lineno in self.methods.items():
              r2.append(HierListCLBRMethod(meth, self.file, lineno))
!         r2.sort()
          return r1+r2
      def IsExpandable(self):