[CMF-checkins] CVS: CMF/CMFCore - MemberDataTool.py:1.20 MembershipTool.py:1.30

[Yvo Schubbe]

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

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

=== CMF/CMFCore/MemberDataTool.py 1.19 => 1.20 ===
--- CMF/CMFCore/MemberDataTool.py:1.19	Thu Oct 17 15:38:35 2002
+++ CMF/CMFCore/MemberDataTool.py	Mon Jan  6 15:35:50 2003
@@ -32,12 +32,18 @@
 from CMFCorePermissions import SetOwnProperties
 from ActionProviderBase import ActionProviderBase
 
+from interfaces.portal_memberdata import portal_memberdata as IMemberDataTool
+from interfaces.portal_memberdata import MemberData as IMemberData
+
 _marker = []  # Create a new marker object.
 
 
 class MemberDataTool (UniqueObject, SimpleItem, PropertyManager, ActionProviderBase):
     '''This tool wraps user objects, making them act as Member objects.
     '''
+
+    __implements__ = (IMemberDataTool, ActionProviderBase.__implements__)
+
     id = 'portal_memberdata'
     meta_type = 'CMF Member Data Tool'
     _actions = []
@@ -80,13 +86,6 @@
     #
     #   'portal_memberdata' interface methods
     #
-    security.declarePrivate('listActions')
-    def listActions(self, info=None):
-        """
-        Return actions provided via tool.
-        """
-        return self._actions
-
     security.declarePrivate('getMemberDataContents')
     def getMemberDataContents(self):
         '''
@@ -183,6 +182,9 @@
 
 
 class MemberData (SimpleItem):
+
+    __implements__ = IMemberData
+
     security = ClassSecurityInfo()
 
     def __init__(self, tool, id):


=== CMF/CMFCore/MembershipTool.py 1.29 => 1.30 ===
--- CMF/CMFCore/MembershipTool.py:1.29	Thu Oct 17 15:38:35 2002
+++ CMF/CMFCore/MembershipTool.py	Mon Jan  6 15:35:50 2003
@@ -31,6 +31,9 @@
 from CMFCorePermissions import SetOwnPassword
 from ActionProviderBase import ActionProviderBase
 
+from interfaces.portal_membership \
+        import portal_membership as IMembershipTool
+
 default_member_content = '''Default page for %s
  
   This is the default document created for you when
@@ -44,6 +47,9 @@
     # This tool accesses member data through an acl_users object.
     # It can be replaced with something that accesses member data in
     # a different way.
+
+    __implements__ = (IMembershipTool, ActionProviderBase.__implements__)
+
     id = 'portal_membership'
     meta_type = 'CMF Membership Tool'
     _actions = []
@@ -415,10 +421,6 @@
         if properties is not None:
             member = self.getMemberById(id)
             member.setMemberProperties(properties)
-
-    security.declarePrivate('listActions')
-    def listActions(self, info=None):
-        return None
 
     security.declarePublic('getHomeFolder')
     def getHomeFolder(self, id=None, verifyPermission=0):