[CMF-checkins] CVS: CMF/CMFCore - MemberDataTool.py:1.21.2.1 MembershipTool.py:1.31.2.1

[Yvo Schubbe]

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

Modified Files:
      Tag: yuppie-collector123-branch
	MemberDataTool.py MembershipTool.py 
Log Message:
- changed _actions' making them tuples (Collector #123)
- reverted copyright updates (I was told it's policy *not* to update copyright statements)

=== CMF/CMFCore/MemberDataTool.py 1.21 => 1.21.2.1 ===
--- CMF/CMFCore/MemberDataTool.py:1.21	Tue Feb  4 17:12:47 2003
+++ CMF/CMFCore/MemberDataTool.py	Sat Feb  8 10:09:51 2003
@@ -1,7 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001-2003 Zope Corporation and Contributors.
-# All Rights Reserved.
+# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
@@ -38,14 +37,15 @@
 
 
 class MemberDataTool (UniqueObject, SimpleItem, PropertyManager, ActionProviderBase):
-    '''This tool wraps user objects, making them act as Member objects.
-    '''
+    """ 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 = []
+    _actions = ()
+
     _v_temps = None
     _properties = ()
 


=== CMF/CMFCore/MembershipTool.py 1.31 => 1.31.2.1 ===
--- CMF/CMFCore/MembershipTool.py:1.31	Tue Feb  4 17:17:40 2003
+++ CMF/CMFCore/MembershipTool.py	Sat Feb  8 10:09:51 2003
@@ -1,7 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001-2003 Zope Corporation and Contributors.
-# All Rights Reserved.
+# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
@@ -43,17 +42,21 @@
 '''
 
 class MembershipTool (UniqueObject, SimpleItem, ActionProviderBase):
-    # This tool accesses member data through an acl_users object.
-    # It can be replaced with something that accesses member data in
-    # a different way.
+    """ 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 = []
-    security = ClassSecurityInfo()
+    _actions = ()
+
     memberareaCreationFlag = 1
+
+    security = ClassSecurityInfo()
 
     manage_options=( ({ 'label' : 'Configuration'
                      , 'action' : 'manage_mapRoles'