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

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

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

Modified Files:
      Tag: py3k
	axsite.py 
Log Message:
merge recent UnicodeType, string module and NeedUnicodeConversions changes from trunk

Index: axsite.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/server/axsite.py,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** axsite.py	1 Jun 2002 02:37:43 -0000	1.2
--- axsite.py	4 Dec 2008 05:08:41 -0000	1.2.4.1
***************
*** 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,68 ****
    def __init__(self, objModel={}, engine = None, lcid=0):
      self.lcid = lcid
- 
      self.objModel = { }
      for name, object in objModel.items():
--- 63,66 ----
***************
*** 73,77 ****
      if engine:
        self._AddEngine(engine)
!     
    def AddEngine(self, engine):
      """Adds a new engine to the site.
--- 71,75 ----
      if engine:
        self._AddEngine(engine)
! 
    def AddEngine(self, engine):
      """Adds a new engine to the site.
***************
*** 100,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')
  
--- 98,102 ----
  
    def GetItemInfo(self, name, returnMask):
!     if name not in self.objModel:
        raise exception.Exception(scode=winerror.TYPE_E_ELEMENTNOTFOUND, desc='item not found')