[CMF-checkins] CVS: CMF/CMFDefault - DiscussionTool.py:1.12 MembershipTool.py:1.28

[Yvo Schubbe]

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

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

=== CMF/CMFDefault/DiscussionTool.py 1.11 => 1.12 ===
--- CMF/CMFDefault/DiscussionTool.py:1.11	Sat Aug  3 22:31:31 2002
+++ CMF/CMFDefault/DiscussionTool.py	Mon Jan  6 15:41:44 2003
@@ -29,11 +29,17 @@
 from Products.CMFCore.ActionProviderBase import ActionProviderBase
 from Products.CMFCore.Expression import Expression
 
+from Products.CMFCore.interfaces.portal_discussion \
+        import portal_discussion as IDiscussionTool
+
+
 class DiscussionNotAllowed( Exception ):
     pass
 
 class DiscussionTool( UniqueObject, SimpleItem, ActionProviderBase ):
 
+    __implements__ = (IDiscussionTool, ActionProviderBase.__implements__)
+
     id = 'portal_discussion'
     meta_type = 'Default Discussion Tool'
     _actions = [ActionInformation(id='reply'
@@ -64,13 +70,6 @@
     #
     #   'portal_discussion' interface methods
     #
-
-    security.declarePrivate('listActions')
-    def listActions(self, info=None):
-        """
-        Return available actions via tool.
-        """
-        return self._actions
 
     security.declarePublic( 'overrideDiscussionFor' )
     def overrideDiscussionFor(self, content, allowDiscussion):


=== CMF/CMFDefault/MembershipTool.py 1.27 => 1.28 ===
--- CMF/CMFDefault/MembershipTool.py:1.27	Thu Oct 17 15:38:35 2002
+++ CMF/CMFDefault/MembershipTool.py	Mon Jan  6 15:41:44 2003
@@ -49,6 +49,9 @@
 class MembershipTool( BaseTool ):
     """ Implement 'portal_membership' interface using "stock" policies.
     """
+
+    __implements__ = BaseTool.__implements__
+
     _actions =[
       AI( id='login'
         , title='Login'
@@ -218,12 +221,5 @@
             return home.absolute_url()
         else:
             return None
-
-    security.declarePrivate( 'listActions' )
-    def listActions(self, info=None):
-
-        """ List actions available through the tool.
-        """
-        return self._actions
 
 InitializeClass(MembershipTool)