[pywin32-checkins] pywin32/Pythonwin/pywin/framework/editor ModuleBrowser.py, 1.8.4.2, 1.8.4.3 __init__.py, 1.2.4.1, 1.2.4.2

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

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

Modified Files:
      Tag: py3k
	ModuleBrowser.py __init__.py 
Log Message:
merge various py3k friendly changes from the trunk.


Index: __init__.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor/__init__.py,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -C2 -d -r1.2.4.1 -r1.2.4.2
*** __init__.py	29 Aug 2008 06:17:09 -0000	1.2.4.1
--- __init__.py	23 Oct 2008 09:45:16 -0000	1.2.4.2
***************
*** 88,90 ****
  	SetEditorOption(option, str(newValue))
  
! from pywin.framework.editor.color.coloreditor import *
--- 88,90 ----
  	SetEditorOption(option, str(newValue))
  
! from pywin.framework.editor.color.coloreditor import editorTemplate

Index: ModuleBrowser.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor/ModuleBrowser.py,v
retrieving revision 1.8.4.2
retrieving revision 1.8.4.3
diff -C2 -d -r1.8.4.2 -r1.8.4.3
*** ModuleBrowser.py	24 Sep 2008 22:47:32 -0000	1.8.4.2
--- ModuleBrowser.py	23 Oct 2008 09:45:16 -0000	1.8.4.3
***************
*** 19,23 ****
      def GetSubList(self):
          ret = []
!         for item in list(self.clbrdata.values()):
              if item.__class__ != pyclbr.Class: # ie, it is a pyclbr Function instance (only introduced post 1.5.2)
                  ret.append(HierListCLBRFunction( item ) )
--- 19,23 ----
      def GetSubList(self):
          ret = []
!         for item in self.clbrdata.itervalues():
              if item.__class__ != pyclbr.Class: # ie, it is a pyclbr Function instance (only introduced post 1.5.2)
                  ret.append(HierListCLBRFunction( item ) )
***************
*** 77,81 ****
          r1.sort()
          r2=[]
!         for meth, lineno in list(self.methods.items()):
              r2.append(HierListCLBRMethod(meth, self.file, lineno))
          r2.sort(key=lambda m:m.GetText())
--- 77,81 ----
          r1.sort()
          r2=[]
!         for meth, lineno in self.methods.iteritems():
              r2.append(HierListCLBRMethod(meth, self.file, lineno))
          r2.sort(key=lambda m:m.GetText())