[CMF-checkins] CVS: CMF/CMFCore - SkinsTool.py:1.15.4.2

[Florent Guillaume]

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

Modified Files:
      Tag: CMF-1_3-branch
	SkinsTool.py 
Log Message:
Merged change from HEAD:

Made SkinsTool derive from Folder and not PortalFolder, like all the
other tools.


=== CMF/CMFCore/SkinsTool.py 1.15.4.1 => 1.15.4.2 ===
 
 from string import split
 from utils import UniqueObject, getToolByName, _dtmldir
-from PortalFolder import PortalFolder
 import Globals
 from Globals import DTMLFile, PersistentMapping
 from SkinsContainer import SkinsContainer
@@ -29,6 +28,7 @@
 from ActionInformation import ActionInformation
 from Expression import Expression
 
+from OFS.Folder import Folder
 from OFS.Image import Image
 from OFS.DTMLMethod import DTMLMethod
 from OFS.ObjectManager import REPLACEABLE
@@ -47,7 +47,7 @@
     # Remove the existing "Properties" option and add our own.
     rval = []
     pos = -1
-    for o in PortalFolder.manage_options:
+    for o in Folder.manage_options:
         label = o.get('label', None)
         if label != 'Properties':
             rval.append(o)
@@ -55,7 +55,7 @@
                   'action':'manage_propertiesForm'}]
     return tuple(rval)
 
-class SkinsTool(UniqueObject, SkinsContainer, PortalFolder, ActionProviderBase):
+class SkinsTool(UniqueObject, SkinsContainer, Folder, ActionProviderBase):
     '''
     This tool is used to supply skins to a portal.
     '''