[CMF-checkins] CVS: CMF/CMFCore - ActionProviderBase.py:1.16.2.1 ActionsTool.py:1.37.2.1 CatalogTool.py:1.39.2.1

[Yvo Schubbe]

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

Modified Files:
      Tag: yuppie-collector123-branch
	ActionProviderBase.py ActionsTool.py CatalogTool.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/ActionProviderBase.py 1.16 => 1.16.2.1 ===
--- CMF/CMFCore/ActionProviderBase.py:1.16	Tue Feb  4 17:06:21 2003
+++ CMF/CMFCore/ActionProviderBase.py	Sat Feb  8 10:06:04 2003
@@ -1,7 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002, 2003 Zope Corporation and Contributors.
-# All Rights Reserved.
+# Copyright (c) 2002 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.
@@ -28,7 +27,6 @@
 
 
 class ActionProviderBase:
-
     """ Provide ActionTabs and management methods for ActionProviders
     """
 
@@ -36,7 +34,8 @@
 
     security = ClassSecurityInfo()
 
-    _actions = []
+    _actions = ()
+
     _actions_form = DTMLFile( 'editToolsActions', _dtmldir )
 
     manage_options = ( { 'label' : 'Actions'
@@ -50,10 +49,9 @@
     #
     security.declarePrivate( 'listActions' )
     def listActions( self, info=None ):
-
         """ Return all the actions defined by a provider.
         """
-        return self._actions or []
+        return self._actions or ()
 
     #
     #   ZMI methods


=== CMF/CMFCore/ActionsTool.py 1.37 => 1.37.2.1 ===
--- CMF/CMFCore/ActionsTool.py:1.37	Tue Feb  4 17:06:21 2003
+++ CMF/CMFCore/ActionsTool.py	Sat Feb  8 10:06:04 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.
@@ -45,7 +44,8 @@
     __implements__ = (IActionsTool, ActionProviderBase.__implements__)
 
     id = 'portal_actions'
-    _actions = [ActionInformation(id='folderContents'
+    meta_type = 'CMF Actions Tool'
+    _actions = (ActionInformation(id='folderContents'
                                 , title='Folder contents'
                                 , action=Expression(
                text='string: ${folder_url}/folder_contents')
@@ -64,9 +64,8 @@
                                 , permissions=('List folder contents',)
                                 , category='folder'
                                 , visible=1
-                                 )]
-
-    meta_type = 'CMF Actions Tool'
+                                 )
+               )
 
     action_providers = ( 'portal_membership'
                        , 'portal_actions'
@@ -115,8 +114,8 @@
             for item in providers:
                 if item not in chosen:
                     new_providers.append(item)
-            providers = tuple(new_providers)
-        self.action_providers = providers
+            providers = new_providers
+        self.action_providers = tuple(providers)
         if REQUEST is not None:
             return self.manage_actionProviders(self , REQUEST
                           , manage_tabs_message='Providers changed.')


=== CMF/CMFCore/CatalogTool.py 1.39 => 1.39.2.1 ===
--- CMF/CMFCore/CatalogTool.py:1.39	Tue Feb  4 17:07:14 2003
+++ CMF/CMFCore/CatalogTool.py	Sat Feb  8 10:06:04 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.
@@ -72,15 +71,16 @@
 
 
 class CatalogTool (UniqueObject, ZCatalog, ActionProviderBase):
-    '''This is a ZCatalog that filters catalog queries.
-    '''
+    """ This is a ZCatalog that filters catalog queries.
+    """
 
     __implements__ = (ICatalogTool, ActionProviderBase.__implements__)
 
     id = 'portal_catalog'
     meta_type = 'CMF Catalog'
+    _actions = ()
+
     security = ClassSecurityInfo()
-    _actions = []
 
     manage_options = ( ZCatalog.manage_options +
                       ActionProviderBase.manage_options +