pywin32-checkins — CVS checkin notices

[pywin32-checkins] pywin32/win32/Demos/security GetTokenInformation.py, 1.2, 1.3

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

Update of /cvsroot/pywin32/pywin32/win32/Demos/security
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25309/win32/Demos/security

Modified Files:
	GetTokenInformation.py 
Log Message:
Use exception attributes

Index: GetTokenInformation.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Demos/security/GetTokenInformation.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GetTokenInformation.py	27 Nov 2008 04:15:21 -0000	1.2
--- GetTokenInformation.py	27 Nov 2008 11:16:30 -0000	1.3
***************
*** 48,52 ****
          print 'TokenElevation:', is_elevated
      except pywintypes.error, details:
!         if details[0] != winerror.ERROR_INVALID_PARAMETER:
              raise
          return None
--- 48,52 ----
          print 'TokenElevation:', is_elevated
      except pywintypes.error, details:
!         if details.winerror != winerror.ERROR_INVALID_PARAMETER:
              raise
          return None

[pywin32-checkins] pywin32/win32/Lib afxres.py,1.2,1.3

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

Update of /cvsroot/pywin32/pywin32/win32/Lib
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25029/win32/Lib

Modified Files:
	afxres.py 
Log Message:
Remove unnecessary 'L' for a constant.


Index: afxres.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/afxres.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** afxres.py	13 Jul 2004 07:46:20 -0000	1.2
--- afxres.py	27 Nov 2008 11:11:45 -0000	1.3
***************
*** 54,58 ****
  AFX_IDW_DOCKBAR_BOTTOM = 0xE81E
  AFX_IDW_DOCKBAR_FLOAT = 0xE81F
! def AFX_CONTROLBAR_MASK(nIDC): return (1L << (nIDC - AFX_IDW_CONTROLBAR_FIRST))
  
  AFX_IDW_PANE_FIRST = 0xE900
--- 54,58 ----
  AFX_IDW_DOCKBAR_BOTTOM = 0xE81E
  AFX_IDW_DOCKBAR_FLOAT = 0xE81F
! def AFX_CONTROLBAR_MASK(nIDC): return (1 << (nIDC - AFX_IDW_CONTROLBAR_FIRST))
  
  AFX_IDW_PANE_FIRST = 0xE900

[pywin32-checkins] pywin32/win32/Demos win32gui_dialog.py, 1.11, 1.12 win32gui_menu.py, 1.9, 1.10

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

Update of /cvsroot/pywin32/pywin32/win32/Demos
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25000/win32/Demos

Modified Files:
	win32gui_dialog.py win32gui_menu.py 
Log Message:
dict upgrades and // for int division

Index: win32gui_dialog.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Demos/win32gui_dialog.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** win32gui_dialog.py	27 Nov 2008 09:42:42 -0000	1.11
--- win32gui_dialog.py	27 Nov 2008 11:11:11 -0000	1.12
***************
*** 44,48 ****
              else:
                  full_fmt += fmt
!         for name, val in kw.items():
              if name not in self.__dict__:
                  raise ValueError("LVITEM structures do not have an item '%s'" % (name,))
--- 44,48 ----
              else:
                  full_fmt += fmt
!         for name, val in kw.iteritems():
              if name not in self.__dict__:
                  raise ValueError("LVITEM structures do not have an item '%s'" % (name,))
***************
*** 248,253 ****
          l,t,r,b = win32gui.GetWindowRect(self.hwnd)
          dt_l, dt_t, dt_r, dt_b = win32gui.GetWindowRect(desktop)
!         centre_x, centre_y = win32gui.ClientToScreen( desktop, ( (dt_r-dt_l)/2, (dt_b-dt_t)/2) )
!         win32gui.MoveWindow(hwnd, centre_x-(r/2), centre_y-(b/2), r-l, b-t, 0)
          self._SetupList()
          l,t,r,b = win32gui.GetClientRect(self.hwnd)
--- 248,253 ----
          l,t,r,b = win32gui.GetWindowRect(self.hwnd)
          dt_l, dt_t, dt_r, dt_b = win32gui.GetWindowRect(desktop)
!         centre_x, centre_y = win32gui.ClientToScreen( desktop, ( (dt_r-dt_l)//2, (dt_b-dt_t)//2) )
!         win32gui.MoveWindow(hwnd, centre_x-(r//2), centre_y-(b//2), r-l, b-t, 0)
          self._SetupList()
          l,t,r,b = win32gui.GetClientRect(self.hwnd)

Index: win32gui_menu.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Demos/win32gui_menu.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** win32gui_menu.py	1 Oct 2008 14:44:53 -0000	1.9
--- win32gui_menu.py	27 Nov 2008 11:11:11 -0000	1.10
***************
*** 315,319 ****
                  crBkgnd = SetBkColor(hDC, GetSysColor(win32con.COLOR_HIGHLIGHT))
      
!             each_pad = self.icon_x_pad / 2
              x_icon = left + GetSystemMetrics(win32con.SM_CXMENUCHECK) + each_pad
              x_text = x_icon + self.menu_icon_width + each_pad
--- 315,319 ----
                  crBkgnd = SetBkColor(hDC, GetSysColor(win32con.COLOR_HIGHLIGHT))
      
!             each_pad = self.icon_x_pad // 2
              x_icon = left + GetSystemMetrics(win32con.SM_CXMENUCHECK) + each_pad
              x_text = x_icon + self.menu_icon_width + each_pad

[pywin32-checkins] pywin32/win32/test test_win32file.py,1.15,1.16

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

Update of /cvsroot/pywin32/pywin32/win32/test
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25000/win32/test

Modified Files:
	test_win32file.py 
Log Message:
dict upgrades and // for int division

Index: test_win32file.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/test_win32file.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** test_win32file.py	23 Oct 2008 07:39:12 -0000	1.15
--- test_win32file.py	27 Nov 2008 11:11:11 -0000	1.16
***************
*** 59,63 ****
      
          # Now truncate the file at 1/2 its existing size.
!         newSize = len(data)/2
          win32file.SetFilePointer(h, newSize, win32file.FILE_BEGIN)
          win32file.SetEndOfFile(h)
--- 59,63 ----
      
          # Now truncate the file at 1/2 its existing size.
!         newSize = len(data)//2
          win32file.SetFilePointer(h, newSize, win32file.FILE_BEGIN)
          win32file.SetEndOfFile(h)

[pywin32-checkins] pywin32/com/win32comext/axscript/server axsite.py, 1.3, 1.4

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/axscript/server
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24942/com/win32comext/axscript/server

Modified Files:
	axsite.py 
Log Message:
Misc cleanups (remove unused string module, dict upgrades, etc)

Index: axsite.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/server/axsite.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** axsite.py	27 Nov 2008 09:42:42 -0000	1.3
--- axsite.py	27 Nov 2008 11:10:04 -0000	1.4
***************
*** 1,3 ****
- import string
  import win32com.axscript.axscript
  import winerror
--- 1,2 ----
***************
*** 44,48 ****
    def SetScriptState(self, state):
      self.eScript.SetScriptState(state)
! 		
  IActiveScriptSite_methods = [
    'GetLCID',
--- 43,47 ----
    def SetScriptState(self, state):
      self.eScript.SetScriptState(state)
! 
  IActiveScriptSite_methods = [
    'GetLCID',
***************
*** 64,77 ****
    def __init__(self, objModel={}, engine = None, lcid=0):
      self.lcid = lcid
- 
      self.objModel = { }
-     for name, object in objModel.items():
-       # Gregs code did string.lower this - I think that is callers job if he wants!
-       self.objModel[name] = object
- 
      self.engine = None
      if engine:
        self._AddEngine(engine)
!     
    def AddEngine(self, engine):
      """Adds a new engine to the site.
--- 63,71 ----
    def __init__(self, objModel={}, engine = None, lcid=0):
      self.lcid = lcid
      self.objModel = { }
      self.engine = None
      if engine:
        self._AddEngine(engine)
! 
    def AddEngine(self, engine):
      """Adds a new engine to the site.
***************
*** 84,88 ****
      self.engine = newEngine
      flags = axscript.SCRIPTITEM_ISVISIBLE | axscript.SCRIPTITEM_NOCODE | axscript.SCRIPTITEM_GLOBALMEMBERS | axscript.SCRIPTITEM_ISPERSISTENT
!     for name in self.objModel.keys():
        newEngine.AddNamedItem(name, flags)
        newEngine.SetScriptState(axscript.SCRIPTSTATE_INITIALIZED)
--- 78,82 ----
      self.engine = newEngine
      flags = axscript.SCRIPTITEM_ISVISIBLE | axscript.SCRIPTITEM_NOCODE | axscript.SCRIPTITEM_GLOBALMEMBERS | axscript.SCRIPTITEM_ISPERSISTENT
!     for name in self.objModel.iterkeys():
        newEngine.AddNamedItem(name, flags)
        newEngine.SetScriptState(axscript.SCRIPTSTATE_INITIALIZED)
***************
*** 100,104 ****
  
    def GetItemInfo(self, name, returnMask):
- #    name = string.lower(name)
      if name not in self.objModel:
        raise exception.Exception(scode=winerror.TYPE_E_ELEMENTNOTFOUND, desc='item not found')
--- 94,97 ----

[pywin32-checkins] pywin32/win32/Lib win32rcparser.py,1.6,1.7

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

Update of /cvsroot/pywin32/pywin32/win32/Lib
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18926/win32/Lib

Modified Files:
	win32rcparser.py 
Log Message:
modernizations: replace most remaining has_key() calls with 'in' statements.

Index: win32rcparser.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32rcparser.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** win32rcparser.py	27 Nov 2008 09:33:22 -0000	1.6
--- win32rcparser.py	27 Nov 2008 09:42:42 -0000	1.7
***************
*** 214,218 ****
                      i = int(lex.get_token())
                      self.ids[n] = i
!                     if self.names.has_key(i):
                          # Dupe ID really isn't a problem - most consumers
                          # want to go from name->id, and this is OK.
--- 214,218 ----
                      i = int(lex.get_token())
                      self.ids[n] = i
!                     if i in self.names:
                          # Dupe ID really isn't a problem - most consumers
                          # want to go from name->id, and this is OK.

[pywin32-checkins] pywin32/com/win32comext/axdebug adb.py, 1.7, 1.8 codecontainer.py, 1.6, 1.7

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

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

Modified Files:
	adb.py codecontainer.py 
Log Message:
modernizations: replace most remaining has_key() calls with 'in' statements.

Index: adb.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/adb.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** adb.py	26 Nov 2008 08:39:33 -0000	1.7
--- adb.py	27 Nov 2008 09:42:41 -0000	1.8
***************
*** 87,91 ****
      def __xxxxx__set_break(self, filename, lineno, cond = None):
          # As per standard one, except no linecache checking!
!         if not self.breaks.has_key(filename):
              self.breaks[filename] = []
          list = self.breaks[filename]
--- 87,91 ----
      def __xxxxx__set_break(self, filename, lineno, cond = None):
          # As per standard one, except no linecache checking!
!         if filename not in self.breaks:
              self.breaks[filename] = []
          list = self.breaks[filename]

Index: codecontainer.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/codecontainer.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** codecontainer.py	27 Nov 2008 03:53:25 -0000	1.6
--- codecontainer.py	27 Nov 2008 09:42:42 -0000	1.7
***************
*** 124,128 ****
  
          if type==tokenize.NAME:
!             if _keywords.has_key(token):
                  attr = axdebug.SOURCETEXT_ATTR_KEYWORD
          elif type==tokenize.STRING:
--- 124,128 ----
  
          if type==tokenize.NAME:
!             if token in _keywords:
                  attr = axdebug.SOURCETEXT_ATTR_KEYWORD
          elif type==tokenize.STRING:

[pywin32-checkins] pywin32/com/win32com/servers PythonTools.py, 1.4, 1.5

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

Update of /cvsroot/pywin32/pywin32/com/win32com/servers
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18926/com/win32com/servers

Modified Files:
	PythonTools.py 
Log Message:
modernizations: replace most remaining has_key() calls with 'in' statements.

Index: PythonTools.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/servers/PythonTools.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PythonTools.py	27 Nov 2008 03:53:25 -0000	1.4
--- PythonTools.py	27 Nov 2008 09:42:41 -0000	1.5
***************
*** 7,11 ****
  
    def reload(self, module):
!     if sys.modules.has_key(module):
        reload(sys.modules[module])
        return "reload succeeded."
--- 7,11 ----
  
    def reload(self, module):
!     if module in sys.modules:
        reload(sys.modules[module])
        return "reload succeeded."

[pywin32-checkins] pywin32/com/win32com/server policy.py, 1.25, 1.26 register.py, 1.23, 1.24

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

Update of /cvsroot/pywin32/pywin32/com/win32com/server
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18926/com/win32com/server

Modified Files:
	policy.py register.py 
Log Message:
modernizations: replace most remaining has_key() calls with 'in' statements.

Index: policy.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/server/policy.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** policy.py	26 Nov 2008 08:52:32 -0000	1.25
--- policy.py	27 Nov 2008 09:42:41 -0000	1.26
***************
*** 409,417 ****
  
    def _getmembername_(self, dispid):
!     if self._dispid_to_func_.has_key(dispid):
        return self._dispid_to_func_[dispid]
!     elif self._dispid_to_get_.has_key(dispid):
        return self._dispid_to_get_[dispid]
!     elif self._dispid_to_put_.has_key(dispid):
        return self._dispid_to_put_[dispid]
      else:
--- 409,417 ----
  
    def _getmembername_(self, dispid):
!     if dispid in self._dispid_to_func_:
        return self._dispid_to_func_[dispid]
!     elif dispid in self._dispid_to_get_:
        return self._dispid_to_get_[dispid]
!     elif dispid in self._dispid_to_put_:
        return self._dispid_to_put_[dispid]
      else:
***************
*** 561,567 ****
        while 1:
          last_dispid = last_dispid + 1
!         if not self._dispid_to_func_.has_key(last_dispid) and \
!            not self._dispid_to_get_.has_key(last_dispid) and \
!            not self._dispid_to_put_.has_key(last_dispid):
                return last_dispid
  
--- 561,567 ----
        while 1:
          last_dispid = last_dispid + 1
!         if last_dispid not in self._dispid_to_func_ and \
!            last_dispid not in self._dispid_to_get_ and \
!            last_dispid not in self._dispid_to_put_:
                return last_dispid
  

Index: register.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/server/register.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** register.py	27 Nov 2008 09:33:22 -0000	1.23
--- register.py	27 Nov 2008 09:42:41 -0000	1.24
***************
*** 361,366 ****
  
  def RegisterClasses(*classes, **flags):
!   quiet = flags.has_key('quiet') and flags['quiet']
!   debugging = flags.has_key('debug') and flags['debug']
    for cls in classes:
      clsid = cls._reg_clsid_
--- 361,366 ----
  
  def RegisterClasses(*classes, **flags):
!   quiet = 'quiet' in flags and flags['quiet']
!   debugging = 'debug' in flags and flags['debug']
    for cls in classes:
      clsid = cls._reg_clsid_
***************
*** 428,432 ****
  
  def UnregisterClasses(*classes, **flags):
!   quiet = flags.has_key('quiet') and flags['quiet']
    for cls in classes:
      clsid = cls._reg_clsid_
--- 428,432 ----
  
  def UnregisterClasses(*classes, **flags):
!   quiet = 'quiet' in flags and flags['quiet']
    for cls in classes:
      clsid = cls._reg_clsid_

[pywin32-checkins] pywin32/win32/Demos win32gui_demo.py, 1.6, 1.7 win32gui_dialog.py, 1.10, 1.11

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

Update of /cvsroot/pywin32/pywin32/win32/Demos
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18926/win32/Demos

Modified Files:
	win32gui_demo.py win32gui_dialog.py 
Log Message:
modernizations: replace most remaining has_key() calls with 'in' statements.

Index: win32gui_demo.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Demos/win32gui_demo.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** win32gui_demo.py	22 Feb 2007 20:45:08 -0000	1.6
--- win32gui_demo.py	27 Nov 2008 09:42:42 -0000	1.7
***************
*** 15,19 ****
      win32gui.EnumWindows(_MyCallback, (windows, classes))
      print "Enumerated a total of %d windows with %d classes" % (len(windows),len(classes))
!     if not classes.has_key("tooltips_class32"):
          print "Hrmmmm - I'm very surprised to not find a 'tooltips_class32' class."
  
--- 15,19 ----
      win32gui.EnumWindows(_MyCallback, (windows, classes))
      print "Enumerated a total of %d windows with %d classes" % (len(windows),len(classes))
!     if "tooltips_class32" not in classes:
          print "Hrmmmm - I'm very surprised to not find a 'tooltips_class32' class."
  

Index: win32gui_dialog.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Demos/win32gui_dialog.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** win32gui_dialog.py	27 Nov 2008 05:58:17 -0000	1.10
--- win32gui_dialog.py	27 Nov 2008 09:42:42 -0000	1.11
***************
*** 45,54 ****
                  full_fmt += fmt
          for name, val in kw.items():
!             if not self.__dict__.has_key(name):
                  raise ValueError("LVITEM structures do not have an item '%s'" % (name,))
              self.__dict__[name] = val
  
      def __setattr__(self, attr, val):
!         if not attr.startswith("_") and not self.__dict__.has_key(attr):
              raise AttributeError(attr)
          self.__dict__[attr] = val
--- 45,54 ----
                  full_fmt += fmt
          for name, val in kw.items():
!             if name not in self.__dict__:
                  raise ValueError("LVITEM structures do not have an item '%s'" % (name,))
              self.__dict__[name] = val
  
      def __setattr__(self, attr, val):
!         if not attr.startswith("_") and attr not in self.__dict__:
              raise AttributeError(attr)
          self.__dict__[attr] = val

[pywin32-checkins] pywin32/com/win32com/test testMSOfficeEvents.py, 1.5, 1.6

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

Update of /cvsroot/pywin32/pywin32/com/win32com/test
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18926/com/win32com/test

Modified Files:
	testMSOfficeEvents.py 
Log Message:
modernizations: replace most remaining has_key() calls with 'in' statements.

Index: testMSOfficeEvents.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testMSOfficeEvents.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** testMSOfficeEvents.py	26 Nov 2008 08:52:32 -0000	1.5
--- testMSOfficeEvents.py	27 Nov 2008 09:42:41 -0000	1.6
***************
*** 99,103 ****
      rc = 1
      for e in events:
!         if not o.seen_events.has_key(e):
              print "ERROR: Expected event did not trigger", e
              rc = 0
--- 99,103 ----
      rc = 1
      for e in events:
!         if e not in o.seen_events:
              print "ERROR: Expected event did not trigger", e
              rc = 0

[pywin32-checkins] pywin32/com/win32com/client combrowse.py, 1.8, 1.9

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

Update of /cvsroot/pywin32/pywin32/com/win32com/client
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18926/com/win32com/client

Modified Files:
	combrowse.py 
Log Message:
modernizations: replace most remaining has_key() calls with 'in' statements.

Index: combrowse.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/combrowse.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** combrowse.py	1 Jul 2008 01:04:40 -0000	1.8
--- combrowse.py	27 Nov 2008 09:42:41 -0000	1.9
***************
*** 520,524 ****
      from pywin.tools import hierlist
      root = HLIRoot("COM Browser")
!     if sys.modules.has_key("app"):
          # do it in a window
          browser.MakeTemplate()
--- 520,524 ----
      from pywin.tools import hierlist
      root = HLIRoot("COM Browser")
!     if "app" in sys.modules:
          # do it in a window
          browser.MakeTemplate()

[pywin32-checkins] pywin32/com/win32comext/axscript/server axsite.py, 1.2, 1.3

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/axscript/server
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18926/com/win32comext/axscript/server

Modified Files:
	axsite.py 
Log Message:
modernizations: replace most remaining has_key() calls with 'in' statements.

Index: axsite.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/server/axsite.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** axsite.py	1 Jun 2002 02:37:43 -0000	1.2
--- axsite.py	27 Nov 2008 09:42:42 -0000	1.3
***************
*** 101,105 ****
    def GetItemInfo(self, name, returnMask):
  #    name = string.lower(name)
!     if not self.objModel.has_key(name):
        raise exception.Exception(scode=winerror.TYPE_E_ELEMENTNOTFOUND, desc='item not found')
  
--- 101,105 ----
    def GetItemInfo(self, name, returnMask):
  #    name = string.lower(name)
!     if name not in self.objModel:
        raise exception.Exception(scode=winerror.TYPE_E_ELEMENTNOTFOUND, desc='item not found')
  

[pywin32-checkins] pywin32/com/win32com/demos excelRTDServer.py, 1.2, 1.3 trybag.py, 1.1, 1.2

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

Update of /cvsroot/pywin32/pywin32/com/win32com/demos
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18926/com/win32com/demos

Modified Files:
	excelRTDServer.py trybag.py 
Log Message:
modernizations: replace most remaining has_key() calls with 'in' statements.

Index: trybag.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/demos/trybag.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** trybag.py	1 Sep 1999 22:59:21 -0000	1.1
--- trybag.py	27 Nov 2008 09:42:41 -0000	1.2
***************
*** 14,18 ****
    def Read(self, propName, varType, errorLog):
      print "read: name=", propName, "type=", varType
!     if not self.data.has_key(propName):
        if errorLog:
          hr = 0x80070057
--- 14,18 ----
    def Read(self, propName, varType, errorLog):
      print "read: name=", propName, "type=", varType
!     if propName not in self.data:
        if errorLog:
          hr = 0x80070057

Index: excelRTDServer.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/demos/excelRTDServer.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** excelRTDServer.py	26 Nov 2008 08:52:32 -0000	1.2
--- excelRTDServer.py	27 Nov 2008 09:42:41 -0000	1.3
***************
*** 156,160 ****
      self.OnDisconnectData(TopicID)
      
!     if self.topics.has_key(TopicID):
        self.topics[TopicID] = None
        del self.topics[TopicID]
--- 156,160 ----
      self.OnDisconnectData(TopicID)
      
!     if TopicID in self.topics:
        self.topics[TopicID] = None
        del self.topics[TopicID]

[pywin32-checkins] pywin32/win32/scripts/VersionStamp bulkstamp.py, 1.7, 1.8

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

Update of /cvsroot/pywin32/pywin32/win32/scripts/VersionStamp
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18926/win32/scripts/VersionStamp

Modified Files:
	bulkstamp.py 
Log Message:
modernizations: replace most remaining has_key() calls with 'in' statements.

Index: bulkstamp.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/scripts/VersionStamp/bulkstamp.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** bulkstamp.py	27 Nov 2008 05:58:17 -0000	1.7
--- bulkstamp.py	27 Nov 2008 09:42:42 -0000	1.8
***************
*** 60,64 ****
            name = base[:-2] + ext
          is_dll = ext.lower() != ".exe"
!         if descriptions.has_key(os.path.normcase(name)):
            desc = descriptions[os.path.normcase(name)]
            try:
--- 60,64 ----
            name = base[:-2] + ext
          is_dll = ext.lower() != ".exe"
!         if os.path.normcase(name) in descriptions:
            desc = descriptions[os.path.normcase(name)]
            try:
***************
*** 96,106 ****
          descriptions[key] = val
  
!   if not retvars.has_key('product'):
      print 'ERROR: description file is missing the product name.'
      sys.exit(1)
!   if not retvars.has_key('major'):
      print 'ERROR: description file is missing the major version number.'
      sys.exit(1)
!   if not retvars.has_key('minor'):
      print 'ERROR: description file is missing the minor version number.'
      sys.exit(1)
--- 96,106 ----
          descriptions[key] = val
  
!   if 'product' not in retvars:
      print 'ERROR: description file is missing the product name.'
      sys.exit(1)
!   if 'major' not in retvars:
      print 'ERROR: description file is missing the major version number.'
      sys.exit(1)
!   if 'minor' not in retvars:
      print 'ERROR: description file is missing the minor version number.'
      sys.exit(1)

[pywin32-checkins] pywin32/Pythonwin/pywin/mfc dialog.py,1.7,1.8

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

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

Modified Files:
	dialog.py 
Log Message:
modernizations: replace most remaining has_key() calls with 'in' statements.

Index: dialog.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/mfc/dialog.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** dialog.py	26 Nov 2008 08:39:33 -0000	1.7
--- dialog.py	27 Nov 2008 09:42:41 -0000	1.8
***************
*** 69,73 ****
  	def items(self): return self.data.items()
  	def values(self): return self.data.values()
! 	def has_key(self, key): return self.data.has_key(key)
  
  class PrintDialog(Dialog):
--- 69,73 ----
  	def items(self): return self.data.items()
  	def values(self): return self.data.values()
! 	def has_key(self, key): return key in self.data
  
  class PrintDialog(Dialog):

[pywin32-checkins] pywin32/Pythonwin/pywin/scintilla formatter.py, 1.15, 1.16

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

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

Modified Files:
	formatter.py 
Log Message:
modernizations: replace most remaining has_key() calls with 'in' statements.

Index: formatter.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla/formatter.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** formatter.py	1 Oct 2008 14:44:53 -0000	1.15
--- formatter.py	27 Nov 2008 09:42:41 -0000	1.16
***************
*** 101,105 ****
  		assert stylenum is not None, "We must have a style number"
  		assert style.stylenum is None, "Style has already been registered"
! 		assert not self.styles.has_key(stylenum), "We are reusing a style number!"
  		style.stylenum = stylenum
  		self.styles[style.name] = style
--- 101,105 ----
  		assert stylenum is not None, "We must have a style number"
  		assert style.stylenum is None, "Style has already been registered"
! 		assert stylenum not in self.styles, "We are reusing a style number!"
  		style.stylenum = stylenum
  		self.styles[style.name] = style

[pywin32-checkins] pywin32/com/win32com/server connect.py, 1.4, 1.5 register.py, 1.22, 1.23

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

Update of /cvsroot/pywin32/pywin32/com/win32com/server
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18082/com/win32com/server

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

Index: connect.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/server/connect.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** connect.py	27 Nov 2008 05:58:17 -0000	1.4
--- connect.py	27 Nov 2008 09:33:22 -0000	1.5
***************
*** 54,58 ****
  		# Broadcasts a notification to all connections.
  		# Ignores clients that fail.
! 		for interface in self.connections.values():
  			try:
  				broadcaster(*(interface,)+extraArgs)
--- 54,58 ----
  		# Broadcasts a notification to all connections.
  		# Ignores clients that fail.
! 		for interface in self.connections.itervalues():
  			try:
  				broadcaster(*(interface,)+extraArgs)

Index: register.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/server/register.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** register.py	26 Nov 2008 08:52:32 -0000	1.22
--- register.py	27 Nov 2008 09:33:22 -0000	1.23
***************
*** 19,23 ****
    hkey = win32api.RegCreateKey(base, keyName)
    try:
!     for key, value in valueDict.items():
        win32api.RegSetValueEx(hkey, key, None, win32con.REG_SZ, value)
    finally:
--- 19,23 ----
    hkey = win32api.RegCreateKey(base, keyName)
    try:
!     for key, value in valueDict.iteritems():
        win32api.RegSetValueEx(hkey, key, None, win32con.REG_SZ, value)
    finally:
***************
*** 270,274 ****
    # set up any other reg values they might have
    if other:
!     for key, value in other.items():
        _set_string(keyNameRoot + '\\' + key, value)
  
--- 270,274 ----
    # set up any other reg values they might have
    if other:
!     for key, value in other.iteritems():
        _set_string(keyNameRoot + '\\' + key, value)
  

[pywin32-checkins] pywin32/com/win32com/test testDictionary.py, 1.9, 1.10 testExchange.py, 1.7, 1.8 testIterators.py, 1.3, 1.4 testPyComTest.py, 1.38, 1.39 testmakepy.py, 1.5, 1.6 testvb.py, 1.22, 1.23

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

Update of /cvsroot/pywin32/pywin32/com/win32com/test
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18082/com/win32com/test

Modified Files:
	testDictionary.py testExchange.py testIterators.py 
	testPyComTest.py testmakepy.py testvb.py 
Log Message:
more moderizations merged from py3k work

Index: testPyComTest.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testPyComTest.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** testPyComTest.py	27 Nov 2008 05:58:17 -0000	1.38
--- testPyComTest.py	27 Nov 2008 09:33:22 -0000	1.39
***************
*** 84,88 ****
          if not self.fireds:
              print "ERROR: Nothing was received!"
!         for firedId, no in self.fireds.items():
              progress("ID %d fired %d times" % (firedId, no))
  
--- 84,88 ----
          if not self.fireds:
              print "ERROR: Nothing was received!"
!         for firedId, no in self.fireds.iteritems():
              progress("ID %d fired %d times" % (firedId, no))
  

Index: testExchange.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testExchange.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** testExchange.py	30 Jun 2008 13:50:09 -0000	1.7
--- testExchange.py	27 Nov 2008 09:33:22 -0000	1.8
***************
*** 61,65 ****
  PropTagsById={}
  if ammodule:
!     for name, val in ammodule.constants.__dict__.items():
          PropTagsById[val] = name
  
--- 61,65 ----
  PropTagsById={}
  if ammodule:
!     for name, val in ammodule.constants.__dict__.iteritems():
          PropTagsById[val] = name
  

Index: testvb.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testvb.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** testvb.py	26 Nov 2008 08:39:33 -0000	1.22
--- testvb.py	27 Nov 2008 09:33:22 -0000	1.23
***************
*** 290,299 ****
          testData = string.split("Mark was here")
          resultData, byRefParam = vbtest.PassSAFEARRAY(testData)
-         # Un unicode everything (only 1.5.2)
-         try:
-             unicode
-         except NameError : # No builtin named Unicode!
-             resultData = map(str, resultData)
-             byRefParam = map(str, byRefParam)
          if testData != list(resultData):
              raise error("The safe array data was not what we expected - got " + str(resultData))
--- 290,293 ----

Index: testIterators.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testIterators.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** testIterators.py	10 Nov 2003 00:49:29 -0000	1.3
--- testIterators.py	27 Nov 2008 09:33:22 -0000	1.4
***************
*** 122,126 ****
      # We dont want our base class run
      suite = unittest.TestSuite()
!     for item in globals().values():
          if type(item)==type(unittest.TestCase) and \
             issubclass(item, unittest.TestCase) and \
--- 122,126 ----
      # We dont want our base class run
      suite = unittest.TestSuite()
!     for item in globals().itervalues():
          if type(item)==type(unittest.TestCase) and \
             issubclass(item, unittest.TestCase) and \

Index: testmakepy.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testmakepy.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** testmakepy.py	12 Apr 2005 06:17:02 -0000	1.5
--- testmakepy.py	27 Nov 2008 09:33:22 -0000	1.6
***************
*** 42,46 ****
              tinfo = (info.clsid, info.lcid, info.major, info.minor)
              mod = gencache.EnsureModule(info.clsid, info.lcid, info.major, info.minor)
!             for name in mod.NamesToIIDMap.keys():
                  makepy.GenerateChildFromTypeLibSpec(name, tinfo)
      return num
--- 42,46 ----
              tinfo = (info.clsid, info.lcid, info.major, info.minor)
              mod = gencache.EnsureModule(info.clsid, info.lcid, info.major, info.minor)
!             for name in mod.NamesToIIDMap.iterkeys():
                  makepy.GenerateChildFromTypeLibSpec(name, tinfo)
      return num

Index: testDictionary.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testDictionary.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** testDictionary.py	27 Nov 2008 03:53:25 -0000	1.9
--- testDictionary.py	27 Nov 2008 09:33:22 -0000	1.10
***************
*** 18,22 ****
  
  def TestDictAgainst(dict,check):
!     for key, value in check.items():
          if dict(key) != value:
              raise error("Indexing for '%s' gave the incorrect value - %s/%s" % (repr(key), repr(dict[key]), repr(check[key])))
--- 18,22 ----
  
  def TestDictAgainst(dict,check):
!     for key, value in check.iteritems():
          if dict(key) != value:
              raise error("Indexing for '%s' gave the incorrect value - %s/%s" % (repr(key), repr(dict[key]), repr(check[key])))

[pywin32-checkins] pywin32/win32/Lib win32rcparser.py,1.5,1.6

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

Update of /cvsroot/pywin32/pywin32/win32/Lib
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18082/win32/Lib

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

Index: win32rcparser.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32rcparser.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** win32rcparser.py	4 Jul 2008 01:55:13 -0000	1.5
--- win32rcparser.py	27 Nov 2008 09:33:22 -0000	1.6
***************
*** 581,595 ****
          print "Dumping all resources in '%s'" % filename
          resources = Parse(filename)
!         for id, ddef in resources.dialogs.items():
              print "Dialog %s (%d controls)" % (id, len(ddef))
              pprint.pprint(ddef)
              print
!         for id, sdef in resources.stringTable.items():
              print "String %s=%r" % (id, sdef.value)
              print
!         for id, sdef in resources.bitmaps.items():
              print "Bitmap %s=%r" % (id, sdef)
              print
!         for id, sdef in resources.icons.items():
              print "Icon %s=%r" % (id, sdef)
              print
--- 581,595 ----
          print "Dumping all resources in '%s'" % filename
          resources = Parse(filename)
!         for id, ddef in resources.dialogs.iteritems():
              print "Dialog %s (%d controls)" % (id, len(ddef))
              pprint.pprint(ddef)
              print
!         for id, sdef in resources.stringTable.iteritems():
              print "String %s=%r" % (id, sdef.value)
              print
!         for id, sdef in resources.bitmaps.iteritems():
              print "Bitmap %s=%r" % (id, sdef)
              print
!         for id, sdef in resources.icons.iteritems():
              print "Icon %s=%r" % (id, sdef)
              print

[pywin32-checkins] pywin32/com/win32com/demos dump_clipboard.py, 1.1, 1.2 ietoolbar.py, 1.4, 1.5

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

Update of /cvsroot/pywin32/pywin32/com/win32com/demos
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18082/com/win32com/demos

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

Index: ietoolbar.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/demos/ietoolbar.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ietoolbar.py	27 Nov 2008 05:58:17 -0000	1.4
--- ietoolbar.py	27 Nov 2008 09:33:22 -0000	1.5
***************
*** 71,79 ****
              else:
                  full_fmt += fmt
!         for name, val in kw.items():
              self.__dict__[name] = val
  
      def __setattr__(self, attr, val):
!         if not attr.startswith("_") and not self.__dict__.has_key(attr):
              raise AttributeError(attr)
          self.__dict__[attr] = val
--- 71,79 ----
              else:
                  full_fmt += fmt
!         for name, val in kw.iteritems():
              self.__dict__[name] = val
  
      def __setattr__(self, attr, val):
!         if not attr.startswith("_") and attr not in self.__dict__:
              raise AttributeError(attr)
          self.__dict__[attr] = val

Index: dump_clipboard.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/demos/dump_clipboard.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dump_clipboard.py	8 Oct 2003 04:25:59 -0000	1.1
--- dump_clipboard.py	27 Nov 2008 09:33:22 -0000	1.2
***************
*** 12,16 ****
      format_name_map[val]=f
  
! tymeds = [attr for attr in pythoncom.__dict__.keys() if attr.startswith("TYMED_")]
  
  def DumpClipboard():
--- 12,16 ----
      format_name_map[val]=f
  
! tymeds = [attr for attr in pythoncom.__dict__.iterkeys() if attr.startswith("TYMED_")]
  
  def DumpClipboard():

[pywin32-checkins] pywin32/com/win32comext/shell/demos/servers shell_view.py, 1.13, 1.14

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18082/com/win32comext/shell/demos/servers

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

Index: shell_view.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers/shell_view.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** shell_view.py	26 Nov 2008 08:52:33 -0000	1.13
--- shell_view.py	27 Nov 2008 09:33:22 -0000	1.14
***************
*** 224,228 ****
          objects = get_clbr_for_file(self.path)
          pidls = []
!         for name, ob in objects.items():
              pidls.append( ["object\0" + self.path + "\0" + name] )
          return NewEnum(pidls, iid=shell.IID_IEnumIDList,
--- 224,228 ----
          objects = get_clbr_for_file(self.path)
          pidls = []
!         for name, ob in objects.iteritems():
              pidls.append( ["object\0" + self.path + "\0" + name] )
          return NewEnum(pidls, iid=shell.IID_IEnumIDList,
***************
*** 281,285 ****
          my_objects = mod_objects[self.class_name]
          pidls = []
!         for func_name, lineno in my_objects.methods.items():
              pidl = ["object\0" + self.path + "\0" +
                      self.class_name + "." + func_name]
--- 281,285 ----
          my_objects = mod_objects[self.class_name]
          pidls = []
!         for func_name, lineno in my_objects.methods.iteritems():
              pidl = ["object\0" + self.path + "\0" +
                      self.class_name + "." + func_name]

[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:

[pywin32-checkins] pywin32/com/win32com/client dynamic.py, 1.25, 1.26 genpy.py, 1.58, 1.59

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

Update of /cvsroot/pywin32/pywin32/com/win32com/client
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18082/com/win32com/client

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

Index: genpy.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/genpy.py,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** genpy.py	27 Nov 2008 03:53:25 -0000	1.58
--- genpy.py	27 Nov 2008 09:33:22 -0000	1.59
***************
*** 878,883 ****
  
      if self.generate_type == GEN_FULL:
!       items = oleItems.values()
!       items = [l for l in items if l is not None]
        items.sort()
        for oleitem in items:
--- 878,882 ----
  
      if self.generate_type == GEN_FULL:
!       items = [l for l in oleItems.itervalues() if l is not None]
        items.sort()
        for oleitem in items:
***************
*** 905,909 ****
      if self.generate_type == GEN_FULL:
        print >> stream, 'CLSIDToClassMap = {'
!       for item in oleItems.values():
            if item is not None and item.bWritten:
                print >> stream, "\t'%s' : %s," % (str(item.clsid), item.python_name)
--- 904,908 ----
      if self.generate_type == GEN_FULL:
        print >> stream, 'CLSIDToClassMap = {'
!       for item in oleItems.itervalues():
            if item is not None and item.bWritten:
                print >> stream, "\t'%s' : %s," % (str(item.clsid), item.python_name)
***************
*** 913,917 ****
        print >> stream, "VTablesToPackageMap = {}"
        print >> stream, "VTablesToClassMap = {"
!       for item in vtableItems.values():
          print >> stream, "\t'%s' : '%s'," % (item.clsid,item.python_name)
        print >> stream, '}'
--- 912,916 ----
        print >> stream, "VTablesToPackageMap = {}"
        print >> stream, "VTablesToClassMap = {"
!       for item in vtableItems.itervalues():
          print >> stream, "\t'%s' : '%s'," % (item.clsid,item.python_name)
        print >> stream, '}'
***************
*** 921,925 ****
        print >> stream, 'CLSIDToClassMap = {}'
        print >> stream, 'CLSIDToPackageMap = {'
!       for item in oleItems.values():
          if item is not None:
            print >> stream, "\t'%s' : %s," % (str(item.clsid), repr(item.python_name))
--- 920,924 ----
        print >> stream, 'CLSIDToClassMap = {}'
        print >> stream, 'CLSIDToPackageMap = {'
!       for item in oleItems.itervalues():
          if item is not None:
            print >> stream, "\t'%s' : %s," % (str(item.clsid), repr(item.python_name))
***************
*** 927,931 ****
        print >> stream, "VTablesToClassMap = {}"
        print >> stream, "VTablesToPackageMap = {"
!       for item in vtableItems.values():
          print >> stream, "\t'%s' : '%s'," % (item.clsid,item.python_name)
        print >> stream, '}'
--- 926,930 ----
        print >> stream, "VTablesToClassMap = {}"
        print >> stream, "VTablesToPackageMap = {"
!       for item in vtableItems.itervalues():
          print >> stream, "\t'%s' : '%s'," % (item.clsid,item.python_name)
        print >> stream, '}'
***************
*** 935,942 ****
      # Bit of a hack - build a temp map of iteItems + vtableItems - coClasses
      map = {}
!     for item in oleItems.values():
          if item is not None and not isinstance(item, CoClassItem):
              map[item.python_name] = item.clsid
!     for item in vtableItems.values(): # No nones or CoClasses in this map
          map[item.python_name] = item.clsid
              
--- 934,941 ----
      # Bit of a hack - build a temp map of iteItems + vtableItems - coClasses
      map = {}
!     for item in oleItems.itervalues():
          if item is not None and not isinstance(item, CoClassItem):
              map[item.python_name] = item.clsid
!     for item in vtableItems.itervalues(): # No nones or CoClasses in this map
          map[item.python_name] = item.clsid
              
***************
*** 1011,1015 ****
  
        self.progress.SetDescription("Generating...", len(items))
!       for oleitem, vtableitem in items.values():
          an_item = oleitem or vtableitem
          assert not self.file, "already have a file?"
--- 1010,1014 ----
  
        self.progress.SetDescription("Generating...", len(items))
!       for oleitem, vtableitem in items.itervalues():
          an_item = oleitem or vtableitem
          assert not self.file, "already have a file?"

Index: dynamic.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/dynamic.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** dynamic.py	26 Nov 2008 01:38:42 -0000	1.25
--- dynamic.py	27 Nov 2008 09:33:22 -0000	1.26
***************
*** 74,82 ****
  dispatchType = pythoncom.TypeIIDs[pythoncom.IID_IDispatch]
  iunkType = pythoncom.TypeIIDs[pythoncom.IID_IUnknown]
! _GoodDispatchType=[str, IIDType, unicode]
  _defaultDispatchItem=build.DispatchItem
  
  def _GetGoodDispatch(IDispatch, clsctx = pythoncom.CLSCTX_SERVER):
! 	if type(IDispatch) in _GoodDispatchType:
  		try:
  			IDispatch = pythoncom.connect(IDispatch)
--- 74,82 ----
  dispatchType = pythoncom.TypeIIDs[pythoncom.IID_IDispatch]
  iunkType = pythoncom.TypeIIDs[pythoncom.IID_IUnknown]
! _GoodDispatchTypes=[str, IIDType, unicode]
  _defaultDispatchItem=build.DispatchItem
  
  def _GetGoodDispatch(IDispatch, clsctx = pythoncom.CLSCTX_SERVER):
! 	if type(IDispatch) in _GoodDispatchTypes:
  		try:
  			IDispatch = pythoncom.connect(IDispatch)

[pywin32-checkins] pywin32/com/win32com/makegw makegwparse.py, 1.14, 1.15

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

Update of /cvsroot/pywin32/pywin32/com/win32com/makegw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18082/com/win32com/makegw

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

Index: makegwparse.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/makegw/makegwparse.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** makegwparse.py	26 Nov 2008 08:52:32 -0000	1.14
--- makegwparse.py	27 Nov 2008 09:33:22 -0000	1.15
***************
*** 571,575 ****
  
  # Auto-add all the simple types
! for key in ConvertSimpleTypes.keys():
  	AllConverters[key] = ArgFormatterSimple, 0
  
--- 571,575 ----
  
  # Auto-add all the simple types
! for key in ConvertSimpleTypes.iterkeys():
  	AllConverters[key] = ArgFormatterSimple, 0