[Zope-Checkins] CVS: CMF/CMFCore/interfaces - portal_workflow.py:1.11

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCore/interfaces
In directory cvs.zope.org:/tmp/cvs-serv21013/CMFCore/interfaces

Modified Files:
	portal_workflow.py 
Log Message:
Merged yuppie-collector096-branch:
- Cleaned up Interfaces and API Help. (Collector #96)
- Removed deprecated 'register' module and interface.

=== CMF/CMFCore/interfaces/portal_workflow.py 1.10 => 1.11 ===
--- CMF/CMFCore/interfaces/portal_workflow.py:1.10	Thu Aug  1 15:05:12 2002
+++ CMF/CMFCore/interfaces/portal_workflow.py	Mon Jan  6 15:40:16 2003
@@ -10,16 +10,22 @@
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-""" Workflow tool interface description.
+""" Workflow tool interface.
 
 $Id$
 """
 
-from Interface import Attribute, Base
+from Interface import Attribute
+try:
+    from Interface import Interface
+except ImportError:
+    # for Zope versions before 2.6.0
+    from Interface import Base as Interface
 
 _marker = []
 
-class portal_workflow(Base):
+
+class portal_workflow(Interface):
     '''This tool accesses and changes the workflow state of content.
     '''
     id = Attribute('id', 'Must be set to "portal_workflow"')
@@ -34,17 +40,6 @@
         that apply to ob.
         '''
 
-    # security.declarePrivate('listActions')
-    def listActions(info):
-        '''
-        Invoked by the portal_actions tool.  Allows workflows to
-        include actions to be displayed in the actions box.
-        Object actions are supplied by workflows that apply
-        to the object.  Global actions are supplied by all
-        workflows.
-        Returns the actions to be displayed to the user.
-        '''
-
     # security.declarePublic('getActionsFor')
     def getActionsFor(ob):
         '''
@@ -117,7 +112,7 @@
         '''
 
 
-class WorkflowDefinition(Base):
+class WorkflowDefinition(Interface):
     '''The interface expected of workflow definitions objects.
     Accesses and changes the workflow state of objects.
     '''
@@ -169,7 +164,7 @@
         '''
 
     # security.declarePrivate('doActionFor')
-    def doActionFor(ob, action, *args, **kw):
+    def doActionFor(ob, action, comment=''):
         '''
         Invoked by the portal_workflow tool.
         Allows the user to request a workflow action.  This method
@@ -184,7 +179,7 @@
         '''
 
     # security.declarePrivate('getInfoFor')
-    def getInfoFor(ob, name, default, *args, **kw):
+    def getInfoFor(ob, name, default):
         '''
         Invoked by the portal_workflow tool.
         Allows the user to request information provided by the