Update of /cvsroot/pywin32/pywin32/com/win32com/client
In directory sc8-pr-cvs1:/tmp/cvs-serv18639
Modified Files:
dynamic.py
Log Message:
Remove use of apply()
Index: dynamic.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/dynamic.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** dynamic.py 19 Nov 2002 11:43:02 -0000 1.17
--- dynamic.py 2 Jul 2003 03:43:13 -0000 1.18
***************
*** 152,156 ****
if invkind is not None:
allArgs = (dispid,LCID,invkind,1) + args
! return self._get_good_object_(apply(self._oleobj_.Invoke,allArgs),self._olerepr_.defaultDispatchName,None)
raise TypeError, "This dispatch object does not define a default method"
--- 152,156 ----
if invkind is not None:
allArgs = (dispid,LCID,invkind,1) + args
! return self._get_good_object_(self._oleobj_.Invoke(*allArgs),self._olerepr_.defaultDispatchName,None)
raise TypeError, "This dispatch object does not define a default method"
***************
*** 219,223 ****
if invkind is not None:
allArgs = (dispid,LCID,invkind,0,index) + args
! return self._get_good_object_(apply(self._oleobj_.Invoke,allArgs),self._olerepr_.defaultDispatchName,None)
raise TypeError, "This dispatch object does not define a default method"
--- 219,223 ----
if invkind is not None:
allArgs = (dispid,LCID,invkind,0,index) + args
! return self._get_good_object_(self._oleobj_.Invoke(*allArgs),self._olerepr_.defaultDispatchName,None)
raise TypeError, "This dispatch object does not define a default method"
***************
*** 238,242 ****
def _ApplyTypes_(self, dispid, wFlags, retType, argTypes, user, resultCLSID, *args):
! result = apply(self._oleobj_.InvokeTypes, (dispid, LCID, wFlags, retType, argTypes) + args)
return self._get_good_object_(result, user, resultCLSID)
--- 238,242 ----
def _ApplyTypes_(self, dispid, wFlags, retType, argTypes, user, resultCLSID, *args):
! result = self._oleobj_.InvokeTypes(*(dispid, LCID, wFlags, retType, argTypes) + args)
return self._get_good_object_(result, user, resultCLSID)
***************
*** 316,320 ****
item = self._olerepr_.mapFuncs[name]
dispId = item.dispid
! return self._get_good_object_(apply( self._oleobj_.Invoke, (dispId, LCID, item.desc[4], 0 ) + (args) ))
except KeyError:
raise AttributeError, name
--- 316,320 ----
item = self._olerepr_.mapFuncs[name]
dispId = item.dispid
! return self._get_good_object_(self._oleobj_.Invoke(*(dispId, LCID, item.desc[4], 0) + (args) ))
except KeyError:
raise AttributeError, name
|