[CMF-checkins] CVS: Products/DCWorkflow - DCWorkflow.py:1.24.4.4 Scripts.py:1.3.20.2

[Sidnei da Silva]

Update of /cvs-repository/Products/DCWorkflow
In directory cvs.zope.org:/tmp/cvs-serv4965/DCWorkflow

Modified Files:
      Tag: CMF-1_4-branch
	DCWorkflow.py Scripts.py 
Log Message:

- Get rid of apply
- Behave accordingly with Zope 2.8


=== Products/DCWorkflow/DCWorkflow.py 1.24.4.3 => 1.24.4.4 ===
--- Products/DCWorkflow/DCWorkflow.py:1.24.4.3	Wed Dec  8 11:53:06 2004
+++ Products/DCWorkflow/DCWorkflow.py	Wed Mar 16 12:57:54 2005
@@ -221,7 +221,7 @@
                             v = qdef.getVarMatch(k)
                             v_fmt = map(lambda x, info=info: x%info, v)
                             dict[k] = v_fmt
-                        searchres = apply(catalog.searchResults, (), dict)
+                        searchres = catalog.searchResults(**dict)
                         if not searchres:
                             continue
                     if fmt_data is None:
@@ -309,7 +309,7 @@
                 % method_id)
         if not self._checkTransitionGuard(tdef, ob):
             raise Unauthorized
-        res = apply(func, args, kw)
+        res = func(*args, **kw)
         try:
             self._changeStateOf(ob, tdef)
         except ObjectDeleted:


=== Products/DCWorkflow/Scripts.py 1.3.20.1 => 1.3.20.2 ===
--- Products/DCWorkflow/Scripts.py:1.3.20.1	Thu Apr 22 13:47:58 2004
+++ Products/DCWorkflow/Scripts.py	Wed Mar 16 12:57:54 2005
@@ -35,6 +35,6 @@
         '''
         '''
         kw['management_view'] = 'Scripts'
-        return apply(Folder.manage_main, (self, client, REQUEST), kw)
+        return Folder.manage_main(self, client, REQUEST, **kw)
 
 Globals.InitializeClass(Scripts)