[Zope-Checkins] CVS: CMF/CMFDefault - RegistrationTool.py:1.16 SyndicationTool.py:1.15

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv21561/CMFDefault

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

=== CMF/CMFDefault/RegistrationTool.py 1.15 => 1.16 ===
--- CMF/CMFDefault/RegistrationTool.py:1.15	Tue Nov 26 13:19:45 2002
+++ CMF/CMFDefault/RegistrationTool.py	Mon Jan  6 15:42:06 2003
@@ -19,24 +19,24 @@
 from Globals import InitializeClass, DTMLFile
 from AccessControl import ClassSecurityInfo
 
-from Products.CMFCore.interfaces.portal_registration import portal_registration
-from Products.CMFCore.utils import UniqueObject
 from Products.CMFCore.utils import _checkPermission
 from Products.CMFCore.utils import getToolByName
 from Products.CMFCore.ActionInformation import ActionInformation
 from Products.CMFCore.Expression import Expression
 from Products.CMFCore.ActionProviderBase import ActionProviderBase
-from Products.CMFCore.RegistrationTool import RegistrationTool
+from Products.CMFCore.RegistrationTool import RegistrationTool as BaseTool
 from Products.CMFCore.CMFCorePermissions import AddPortalMember
 from Products.CMFCore.CMFCorePermissions import ManagePortal
 
 from utils import _dtmldir
 
-class RegistrationTool (RegistrationTool, ActionProviderBase):
+class RegistrationTool(BaseTool):
 
     """ Manage through-the-web signup policies.
     """
-    __implements__ = ( portal_registration, )
+
+    __implements__ = BaseTool.__implements__
+
     meta_type = 'Default Registration Tool'
 
     _actions = [ ActionInformation( id='join'
@@ -65,16 +65,6 @@
                        )
                      )
     manage_overview = DTMLFile( 'explainRegistrationTool', _dtmldir )
-
-    #
-    #   ActionProvider interface
-    #
-    security.declarePublic('listActions')
-    def listActions(self, info=None):
-        """
-        Return actions provided via tool.
-        """
-        return self._actions 
 
     #
     #   'portal_registration' interface


=== CMF/CMFDefault/SyndicationTool.py 1.14 => 1.15 ===
--- CMF/CMFDefault/SyndicationTool.py:1.14	Sat Aug  3 22:31:31 2002
+++ CMF/CMFDefault/SyndicationTool.py	Mon Jan  6 15:42:06 2003
@@ -45,6 +45,8 @@
         syndication of folder content as RSS.
     """
 
+    __implements__ = ActionProviderBase.__implements__
+
     id = 'portal_syndication'
 
     meta_type = 'Default Syndication Tool'
@@ -108,13 +110,6 @@
     security.declareProtected(ManagePortal, 'reportForm')
     reportForm = HTMLFile('synReports', _dtmldir)
    
-    security.declarePrivate('listActions')
-    def listActions(self, info=None):
-        """
-        Return actions provided by tool
-        """
-        return self._actions
-
     security.declareProtected(ManagePortal, 'editProperties')
     def editProperties( self
                       , updatePeriod=None