[CMF-checkins] CVS: CMF/CMFCore - SkinsTool.py:1.23 TypesTool.py:1.49 URLTool.py:1.4 UndoTool.py:1.14

[Yvo Schubbe]

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

Modified Files:
	SkinsTool.py TypesTool.py URLTool.py UndoTool.py 
Log Message:
Merged yuppie-collector123-branch:
- Changed _actions' making them tuples. (Collector #123)

=== CMF/CMFCore/SkinsTool.py 1.22 => 1.23 ===
--- CMF/CMFCore/SkinsTool.py:1.22	Tue Feb  4 17:18:07 2003
+++ CMF/CMFCore/SkinsTool.py	Thu Feb 13 02:44:48 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.
@@ -60,15 +59,15 @@
     return tuple(rval)
 
 class SkinsTool(UniqueObject, SkinsContainer, Folder, ActionProviderBase):
-    '''
-    This tool is used to supply skins to a portal.
-    '''
+    """ This tool is used to supply skins to a portal.
+    """
 
     __implements__ = (ISkinsTool, ActionProviderBase.__implements__)
 
     id = 'portal_skins'
     meta_type = 'CMF Skins Tool'
-    _actions = []
+    _actions = ()
+
     cookie_persistence = 0
 
     security = ClassSecurityInfo()


=== CMF/CMFCore/TypesTool.py 1.48 => 1.49 ===
--- CMF/CMFCore/TypesTool.py:1.48	Tue Feb  4 17:18:07 2003
+++ CMF/CMFCore/TypesTool.py	Thu Feb 13 02:44:48 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.
@@ -16,8 +15,9 @@
 $Id$
 """
 
-import OFS
 from Globals import InitializeClass, DTMLFile
+from OFS.Folder import Folder
+
 from utils import _checkPermission
 from utils import _dtmldir
 from utils import cookString
@@ -608,7 +608,7 @@
     ]
 
 
-class TypesTool( UniqueObject, OFS.Folder.Folder, ActionProviderBase ):
+class TypesTool(UniqueObject, Folder, ActionProviderBase):
     """
         Provides a configurable registry of portal content types.
     """
@@ -617,11 +617,11 @@
 
     id = 'portal_types'
     meta_type = 'CMF Types Tool'
-    _actions = []
+    _actions = ()
 
     security = ClassSecurityInfo()
 
-    manage_options = ( OFS.Folder.Folder.manage_options +
+    manage_options = ( Folder.manage_options +
                       ActionProviderBase.manage_options +
                       ({ 'label' : 'Overview', 'action' : 'manage_overview' }
                      , 


=== CMF/CMFCore/URLTool.py 1.3 => 1.4 ===
--- CMF/CMFCore/URLTool.py:1.3	Tue Feb  4 17:24:25 2003
+++ CMF/CMFCore/URLTool.py	Thu Feb 13 02:44:48 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.
@@ -40,7 +39,7 @@
 
     id = 'portal_url'
     meta_type = 'CMF URL Tool'
-    _actions = []
+    _actions = ()
 
     security = ClassSecurityInfo()
     security.declareObjectProtected(View)


=== CMF/CMFCore/UndoTool.py 1.13 => 1.14 ===
--- CMF/CMFCore/UndoTool.py:1.13	Tue Feb  4 17:24:25 2003
+++ CMF/CMFCore/UndoTool.py	Thu Feb 13 02:44:48 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.
@@ -34,13 +33,14 @@
 
 
 class UndoTool (UniqueObject, SimpleItem, ActionProviderBase):
+    """ This tool is used to undo changes.
+    """
 
     __implements__ = (IUndoTool, ActionProviderBase.__implements__)
 
     id = 'portal_undo'
     meta_type = 'CMF Undo Tool'
-    # This tool is used to undo changes.
-    _actions = [ActionInformation(id='undo'
+    _actions = (ActionInformation(id='undo'
                                 , title='Undo'
                                 , action=Expression(
                text='string: ${portal_url}/undo_form')
@@ -49,8 +49,9 @@
                                 , permissions=(ListUndoableChanges,)
                                 , category='global'
                                 , visible=1
-                                 )]
-
+                                 )
+               ,
+               )
 
     security = ClassSecurityInfo()