[CMF-checkins] CVS: CMF/CMFDefault - RegistrationTool.py:1.18 SyndicationTool.py:1.18

[Yvo Schubbe]

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

Modified Files:
	RegistrationTool.py SyndicationTool.py 
Log Message:
Merged yuppie-collector123-branch:
- Changed _actions' making them tuples. (Collector #123)

=== CMF/CMFDefault/RegistrationTool.py 1.17 => 1.18 ===
--- CMF/CMFDefault/RegistrationTool.py:1.17	Tue Feb  4 17:38:01 2003
+++ CMF/CMFDefault/RegistrationTool.py	Thu Feb 13 02:52:03 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.
@@ -11,7 +10,7 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-"""CMFDefault portal_registration tool.
+""" CMFDefault portal_registration tool.
 
 $Id$
 """
@@ -31,15 +30,13 @@
 from utils import _dtmldir
 
 class RegistrationTool(BaseTool):
-
     """ Manage through-the-web signup policies.
     """
 
     __implements__ = BaseTool.__implements__
 
     meta_type = 'Default Registration Tool'
-
-    _actions = [ ActionInformation( id='join'
+    _actions = ( ActionInformation( id='join'
                                   , title='Join'
                                   , description='Click here to Join'
                                   , action=Expression(
@@ -48,7 +45,9 @@
                                   , category='user'
                                   , condition=Expression(text='not: member')
                                   , visible=1
-                                  ) ]
+                                  )
+               ,
+               )
 
     security = ClassSecurityInfo()
 


=== CMF/CMFDefault/SyndicationTool.py 1.17 => 1.18 ===
--- CMF/CMFDefault/SyndicationTool.py:1.17	Sun Feb  9 12:01:57 2003
+++ CMF/CMFDefault/SyndicationTool.py	Thu Feb 13 02:52:03 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.
@@ -47,10 +46,8 @@
     __implements__ = ActionProviderBase.__implements__
 
     id = 'portal_syndication'
-
     meta_type = 'Default Syndication Tool'
-
-    _actions = [ ActionInformation(
+    _actions = ( ActionInformation(
                     id='syndication'
                   , title='Syndication'
                   , action=Expression(
@@ -61,10 +58,9 @@
                   , category='folder'
                   , visible=1
                   )
-               ]
+               ,
+               )
 
-    security = ClassSecurityInfo()
-    
     #Default Sitewide Values
     isAllowed = 0
     syUpdatePeriod = 'daily'
@@ -72,6 +68,8 @@
     syUpdateBase = DateTime()
     max_items = 15
 
+    security = ClassSecurityInfo()
+    
     #ZMI Methods
     manage_options = ( ActionProviderBase.manage_options
                      + ( { 'label'  : 'Overview'