[pywin32-checkins] pywin32/com/win32comext/axdebug expressions.py, 1.5.4.2, 1.5.4.3

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/axdebug
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29773/com/win32comext/axdebug

Modified Files:
      Tag: py3k
	expressions.py 
Log Message:
merge more .py changes from the trunk (via 2to3)

Index: expressions.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/expressions.py,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.3
diff -C2 -d -r1.5.4.2 -r1.5.4.3
*** expressions.py	4 Dec 2008 07:32:06 -0000	1.5.4.2
--- expressions.py	11 Dec 2008 05:45:21 -0000	1.5.4.3
***************
*** 70,78 ****
  def MakeEnumDebugProperty(object, dwFieldSpec, nRadix, iid, stackFrame = None):
      name_vals = []
!     if hasattr(object, "has_key"): # If it is a dict.
!         name_vals = object.items()
          dictionary = object
      elif hasattr(object, "__dict__"):  #object with dictionary, module
!         name_vals = object.__dict__.items()
          dictionary = object.__dict__
      infos = []
--- 70,78 ----
  def MakeEnumDebugProperty(object, dwFieldSpec, nRadix, iid, stackFrame = None):
      name_vals = []
!     if hasattr(object, "items") and hasattr(object, "keys"): # If it is a dict.
!         name_vals = iter(object.items())
          dictionary = object
      elif hasattr(object, "__dict__"):  #object with dictionary, module
!         name_vals = iter(object.__dict__.items())
          dictionary = object.__dict__
      infos = []