[CMF-checkins] CVS: CMF/CMFCore - ActionsTool.py:1.35.8.2 MemberDataTool.py:1.19.8.2 MembershipTool.py:1.29.8.2

[Yvo Schubbe]

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

Modified Files:
      Tag: yuppie-collector096-branch
	ActionsTool.py MemberDataTool.py MembershipTool.py 
Log Message:
tool interface cleanup:
- added portal_properties interface
- added interface tests and made them pass

=== CMF/CMFCore/ActionsTool.py 1.35.8.1 => 1.35.8.2 ===
--- CMF/CMFCore/ActionsTool.py:1.35.8.1	Wed Dec 18 16:41:33 2002
+++ CMF/CMFCore/ActionsTool.py	Thu Dec 19 13:19:57 2002
@@ -35,13 +35,16 @@
 from utils import _dtmldir
 from utils import cookString
 
+from interfaces.portal_actions import portal_actions as IActionsTool
+
+
 class ActionsTool(UniqueObject, Folder, ActionProviderBase):
     """
         Weave together the various sources of "actions" which are apropos
         to the current user and context.
     """
 
-    __implements__ = ActionProviderBase.__implements__
+    __implements__ = (IActionsTool, ActionProviderBase.__implements__)
 
     id = 'portal_actions'
     _actions = [ActionInformation(id='folderContents'


=== CMF/CMFCore/MemberDataTool.py 1.19.8.1 => 1.19.8.2 ===
--- CMF/CMFCore/MemberDataTool.py:1.19.8.1	Wed Dec 18 16:41:45 2002
+++ CMF/CMFCore/MemberDataTool.py	Thu Dec 19 13:19:57 2002
@@ -32,6 +32,9 @@
 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.
 
 
@@ -39,7 +42,7 @@
     '''This tool wraps user objects, making them act as Member objects.
     '''
 
-    __implements__ = ActionProviderBase.__implements__
+    __implements__ = (IMemberDataTool, ActionProviderBase.__implements__)
 
     id = 'portal_memberdata'
     meta_type = 'CMF Member Data Tool'
@@ -179,6 +182,9 @@
 
 
 class MemberData (SimpleItem):
+
+    __implements__ = IMemberData
+
     security = ClassSecurityInfo()
 
     def __init__(self, tool, id):


=== CMF/CMFCore/MembershipTool.py 1.29.8.1 => 1.29.8.2 ===
--- CMF/CMFCore/MembershipTool.py:1.29.8.1	Wed Dec 18 16:41:57 2002
+++ CMF/CMFCore/MembershipTool.py	Thu Dec 19 13:19:57 2002
@@ -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
@@ -45,7 +48,7 @@
     # It can be replaced with something that accesses member data in
     # a different way.
 
-    __implements__ = ActionProviderBase.__implements__
+    __implements__ = (IMembershipTool, ActionProviderBase.__implements__)
 
     id = 'portal_membership'
     meta_type = 'CMF Membership Tool'