[Zope-Checkins] CVS: Zope/lib/python/Products/ExternalMethod - ExternalMethod.py:1.51.68.1

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Products/ExternalMethod
In directory cvs.zope.org:/tmp/cvs-serv17213/lib/python/Products/ExternalMethod

Modified Files:
      Tag: Zope-2_7-branch
	ExternalMethod.py 
Log Message:
Merge changes from HEAD since the release of Zope 2.7a1 into the Zope-2_7-branch in preparation for release of Zope 2.7b1.


=== Zope/lib/python/Products/ExternalMethod/ExternalMethod.py 1.51 => 1.51.68.1 ===
--- Zope/lib/python/Products/ExternalMethod/ExternalMethod.py:1.51	Wed Aug 14 18:14:10 2002
+++ Zope/lib/python/Products/ExternalMethod/ExternalMethod.py	Mon Jul 21 12:35:50 2003
@@ -221,14 +221,14 @@
 
         __traceback_info__=args, kw, self._v_func_defaults
 
-        try: return apply(f,args,kw)
+        try: return f(*args, **kw)
         except TypeError, v:
             tb=sys.exc_info()[2]
             try:
                 if ((self._v_func_code.co_argcount-
                      len(self._v_func_defaults or ()) - 1 == len(args))
                     and self._v_func_code.co_varnames[0]=='self'):
-                    return apply(f,(self.aq_parent.this(),)+args,kw)
+                    return f(self.aq_parent.this(), *args, **kw)
 
                 raise TypeError, v, tb
             finally: tb=None