[CMF-checkins] CVS: Products/CMFTopic - AbstractCriterion.py:1.6.18.2 Topic.py:1.32.4.3

[Sidnei da Silva]

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

Modified Files:
      Tag: CMF-1_4-branch
	AbstractCriterion.py Topic.py 
Log Message:

- Get rid of apply
- Behave accordingly with Zope 2.8


=== Products/CMFTopic/AbstractCriterion.py 1.6.18.1 => 1.6.18.2 ===
--- Products/CMFTopic/AbstractCriterion.py:1.6.18.1	Thu Apr 22 13:47:55 2004
+++ Products/CMFTopic/AbstractCriterion.py	Wed Mar 16 12:57:54 2005
@@ -40,7 +40,7 @@
             Apply 'command', which is expected to be a dictionary,
             to 'self.edit' (makes using Python Scripts easier).
         """
-        apply( self.edit, (), command )
+        self.edit(**command)
 
     security.declareProtected( ChangeTopics, 'editableAttributes' )
     def editableAttributes( self ):


=== Products/CMFTopic/Topic.py 1.32.4.2 => 1.32.4.3 ===
--- Products/CMFTopic/Topic.py:1.32.4.2	Thu Apr 22 13:47:56 2004
+++ Products/CMFTopic/Topic.py	Wed Mar 16 12:57:54 2005
@@ -117,7 +117,7 @@
         """
         view = _getViewFor( self )
         if getattr( aq_base( view ), 'isDocTemp', 0 ):
-            return apply( view, ( self, self.REQUEST ) )
+            return view(self, self.REQUEST)
         else:
             return view()
 
@@ -215,7 +215,7 @@
         """
         kw.update( self.buildQuery() )
         portal_catalog = getToolByName( self, 'portal_catalog' )
-        return apply( portal_catalog.searchResults, ( REQUEST, ), kw )
+        return portal_catalog.searchResults(REQUEST, **kw)
 
 
     ### Criteria adding/editing/deleting