[Zope-Checkins] CVS: Zope/lib/python/Products/PythonScripts - PythonScript.py:1.46.2.2 standard.py:1.13.4.1

[Chris McDonough]

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

Modified Files:
      Tag: Zope-2_7-branch
	PythonScript.py standard.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/PythonScripts/PythonScript.py 1.46.2.1 => 1.46.2.2 ===
--- Zope/lib/python/Products/PythonScripts/PythonScript.py:1.46.2.1	Sun Jul  6 06:47:34 2003
+++ Zope/lib/python/Products/PythonScripts/PythonScript.py	Mon Jul 21 12:36:04 2003
@@ -317,7 +317,7 @@
         security=getSecurityManager()
         security.addContext(self)
         try:
-            result = apply(f, args, kw)
+            result = f(*args, **kw)
             if keyset is not None:
                 # Store the result in the cache.
                 self.ZCacheable_set(result, keywords=keyset)


=== Zope/lib/python/Products/PythonScripts/standard.py 1.13 => 1.13.4.1 ===
--- Zope/lib/python/Products/PythonScripts/standard.py:1.13	Sun Apr 13 13:51:54 2003
+++ Zope/lib/python/Products/PythonScripts/standard.py	Mon Jul 21 12:36:05 2003
@@ -50,7 +50,7 @@
         security=getSecurityManager()
         security.addContext(self)
         try:
-            return apply(HTML.__call__, (self, client, REQUEST), kw)
+            return HTML.__call__(self, client, REQUEST, **kw)
 
         finally: security.removeContext(self)