[pywin32-checkins] pywin32/Pythonwin/pywin/scintilla view.py, 1.30, 1.31

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

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

Modified Files:
	view.py 
Log Message:
more moderizations merged from py3k work

Index: view.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla/view.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** view.py	14 Nov 2008 00:22:25 -0000	1.30
--- view.py	27 Nov 2008 09:33:22 -0000	1.31
***************
*** 446,450 ****
  
  		# ensure all keys are strings.
! 		items = [str(k) for k in items_dict.keys()]
  		# All names that start with "_" go!
  		items = [k for k in items if not k.startswith('_')]
--- 446,450 ----
  
  		# ensure all keys are strings.
! 		items = [str(k) for k in items_dict.iterkeys()]
  		# All names that start with "_" go!
  		items = [k for k in items if not k.startswith('_')]
***************
*** 478,482 ****
  				self._UpdateWithClassMethods(unique,curclass)
  
! 			items = [word for word in unique.keys() if word[:2]!='__' or word[-2:]!='__']
  			# Ignore the word currently to the right of the dot - probably a red-herring.
  			try:
--- 478,482 ----
  				self._UpdateWithClassMethods(unique,curclass)
  
! 			items = [word for word in unique.iterkeys() if word[:2]!='__' or word[-2:]!='__']
  			# Ignore the word currently to the right of the dot - probably a red-herring.
  			try: