Update of /cvsroot/pywin32/pywin32/com/win32comext/axscript/client
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18639/com/win32comext/axscript/client
Modified Files:
pyscript.py scriptdispatch.py
Log Message:
various syntax modernizations
Index: pyscript.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/client/pyscript.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** pyscript.py 26 Nov 2008 01:50:18 -0000 1.12
--- pyscript.py 26 Nov 2008 08:39:33 -0000 1.13
***************
*** 54,61 ****
def __getattr__(self, attr):
if attr[1]=="_" and attr[:-1]=="_":
! raise AttributeError, attr
rc = self._FindAttribute_(attr)
if rc is None:
! raise AttributeError, attr
return rc
def _Close_(self):
--- 54,61 ----
def __getattr__(self, attr):
if attr[1]=="_" and attr[:-1]=="_":
! raise AttributeError(attr)
rc = self._FindAttribute_(attr)
if rc is None:
! raise AttributeError(attr)
return rc
def _Close_(self):
***************
*** 73,77 ****
except AttributeError:
pass
! raise AttributeError, attr
def _FindAttribute_(self, attr):
--- 73,77 ----
except AttributeError:
pass
! raise AttributeError(attr)
def _FindAttribute_(self, attr):
***************
*** 84,88 ****
# (mainly b/w compat)
return getattr(self._scriptEngine_.globalNameSpaceModule, attr)
! # raise AttributeError, attr
class NamedScriptAttribute:
--- 84,88 ----
# (mainly b/w compat)
return getattr(self._scriptEngine_.globalNameSpaceModule, attr)
! # raise AttributeError(attr)
class NamedScriptAttribute:
***************
*** 104,108 ****
if self._scriptItem_.dispatchContainer:
return getattr(self._scriptItem_.dispatchContainer,attr)
! raise AttributeError, attr
def __setattr__(self, attr, value):
# XXX - todo - if a known item, then should call its default
--- 104,108 ----
if self._scriptItem_.dispatchContainer:
return getattr(self._scriptItem_.dispatchContainer,attr)
! raise AttributeError(attr)
def __setattr__(self, attr, value):
# XXX - todo - if a known item, then should call its default
***************
*** 114,118 ****
except AttributeError:
pass
! raise AttributeError, attr
def _Close_(self):
self.__dict__['_scriptItem_'] = None
--- 114,118 ----
except AttributeError:
pass
! raise AttributeError(attr)
def _Close_(self):
self.__dict__['_scriptItem_'] = None
Index: scriptdispatch.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/client/scriptdispatch.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** scriptdispatch.py 20 May 2005 23:27:54 -0000 1.4
--- scriptdispatch.py 26 Nov 2008 08:39:33 -0000 1.5
***************
*** 38,42 ****
func = getattr(self.scriptNamespace, name)
if not _is_callable(func):
! raise AttributeError, name # Not a function.
realArgs = []
for arg in args:
--- 38,42 ----
func = getattr(self.scriptNamespace, name)
if not _is_callable(func):
! raise AttributeError(name) # Not a function.
realArgs = []
for arg in args:
***************
*** 59,63 ****
ret = getattr(self.scriptNamespace, name)
if _is_callable(ret):
! raise AttributeError, name # Not a property.
except AttributeError:
raise COMException(scode=winerror.DISP_E_MEMBERNOTFOUND)
--- 59,63 ----
ret = getattr(self.scriptNamespace, name)
if _is_callable(ret):
! raise AttributeError(name) # Not a property.
except AttributeError:
raise COMException(scode=winerror.DISP_E_MEMBERNOTFOUND)
|
