[CMF-checkins] SVN: CMF/trunk/CMF - removed ActionProviderBase
where obsolete
Yvo Schubbe
y.2007- at wcm-solutions.de
Thu Jun 21 10:18:54 EDT 2007
Log message for revision 76901:
- removed ActionProviderBase where obsolete
this removes self.REQUEST dependencies
Changed:
U CMF/trunk/CMFCore/MemberDataTool.py
U CMF/trunk/CMFCore/MembershipTool.py
U CMF/trunk/CMFCore/RegistrationTool.py
U CMF/trunk/CMFCore/UndoTool.py
U CMF/trunk/CMFCore/tests/test_MemberDataTool.py
U CMF/trunk/CMFCore/tests/test_MembershipTool.py
U CMF/trunk/CMFCore/tests/test_RegistrationTool.py
U CMF/trunk/CMFCore/tests/test_UndoTool.py
U CMF/trunk/CMFDefault/DiscussionTool.py
U CMF/trunk/CMFDefault/MetadataTool.py
U CMF/trunk/CMFDefault/PropertiesTool.py
U CMF/trunk/CMFDefault/SyndicationTool.py
U CMF/trunk/CMFDefault/tests/test_DiscussionTool.py
U CMF/trunk/CMFDefault/tests/test_MembershipTool.py
U CMF/trunk/CMFDefault/tests/test_MetadataTool.py
U CMF/trunk/CMFDefault/tests/test_PropertiesTool.py
U CMF/trunk/CMFDefault/tests/test_RegistrationTool.py
U CMF/trunk/CMFDefault/tests/test_SyndicationTool.py
U CMF/trunk/CMFUid/UniqueIdAnnotationTool.py
U CMF/trunk/CMFUid/UniqueIdGeneratorTool.py
U CMF/trunk/CMFUid/UniqueIdHandlerTool.py
-=-
Modified: CMF/trunk/CMFCore/MemberDataTool.py
===================================================================
--- CMF/trunk/CMFCore/MemberDataTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFCore/MemberDataTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -27,7 +27,6 @@
from zope.interface import implements
from ZPublisher.Converters import type_converters
-from ActionProviderBase import ActionProviderBase
from exceptions import BadRequest
from interfaces import IMemberData
from interfaces import IMemberDataTool
@@ -43,8 +42,7 @@
_marker = [] # Create a new marker object.
-class MemberDataTool(UniqueObject, SimpleItem, PropertyManager,
- ActionProviderBase):
+class MemberDataTool(UniqueObject, SimpleItem, PropertyManager):
""" This tool wraps user objects, making them act as Member objects.
"""
@@ -58,14 +56,10 @@
security = ClassSecurityInfo()
- manage_options=( ActionProviderBase.manage_options +
- ({ 'label' : 'Overview'
- , 'action' : 'manage_overview'
- }
- , { 'label' : 'Contents'
- , 'action' : 'manage_showContents'
- }
- )
+ manage_options=( ({'label': 'Overview',
+ 'action': 'manage_overview'},
+ {'label': 'Contents',
+ 'action': 'manage_showContents'})
+ PropertyManager.manage_options
+ SimpleItem.manage_options
)
Modified: CMF/trunk/CMFCore/MembershipTool.py
===================================================================
--- CMF/trunk/CMFCore/MembershipTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFCore/MembershipTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -32,7 +32,6 @@
from zope.component import queryUtility
from zope.interface import implements
-from ActionProviderBase import ActionProviderBase
from exceptions import AccessControl_Unauthorized
from exceptions import BadRequest
from interfaces import IMemberDataTool
@@ -54,7 +53,7 @@
logger = logging.getLogger('CMFCore.MembershipTool')
-class MembershipTool(UniqueObject, Folder, ActionProviderBase):
+class MembershipTool(UniqueObject, Folder):
""" This tool accesses member data through an acl_users object.
@@ -73,7 +72,6 @@
manage_options=( ({ 'label' : 'Configuration'
, 'action' : 'manage_mapRoles'
},) +
- ActionProviderBase.manage_options +
( { 'label' : 'Overview'
, 'action' : 'manage_overview'
},
Modified: CMF/trunk/CMFCore/RegistrationTool.py
===================================================================
--- CMF/trunk/CMFCore/RegistrationTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFCore/RegistrationTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -25,7 +25,6 @@
from zope.component import getUtility
from zope.interface import implements
-from ActionProviderBase import ActionProviderBase
from interfaces import IMembershipTool
from interfaces import IRegistrationTool
from permissions import AddPortalMember
@@ -38,7 +37,7 @@
from utils import UniqueObject
-class RegistrationTool(UniqueObject, SimpleItem, ActionProviderBase):
+class RegistrationTool(UniqueObject, SimpleItem):
""" Create and modify users by making calls to portal_membership.
"""
@@ -53,10 +52,12 @@
security = ClassSecurityInfo()
- manage_options = (ActionProviderBase.manage_options +
- ({ 'label' : 'Overview', 'action' : 'manage_overview' }
- ,{ 'label' : 'Configure', 'action' : 'manage_configuration' }
- ) + SimpleItem.manage_options)
+ manage_options = ( ({'label': 'Overview',
+ 'action': 'manage_overview'},
+ {'label': 'Configure',
+ 'action': 'manage_configuration'})
+ + SimpleItem.manage_options
+ )
#
# ZMI methods
Modified: CMF/trunk/CMFCore/UndoTool.py
===================================================================
--- CMF/trunk/CMFCore/UndoTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFCore/UndoTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -21,7 +21,6 @@
from OFS.SimpleItem import SimpleItem
from zope.interface import implements
-from ActionProviderBase import ActionProviderBase
from exceptions import AccessControl_Unauthorized
from interfaces import IUndoTool
from permissions import ListUndoableChanges
@@ -33,7 +32,7 @@
from utils import UniqueObject
-class UndoTool(UniqueObject, SimpleItem, ActionProviderBase):
+class UndoTool(UniqueObject, SimpleItem):
""" This tool is used to undo changes.
"""
@@ -45,11 +44,11 @@
security = ClassSecurityInfo()
- manage_options = ( ActionProviderBase.manage_options +
- SimpleItem.manage_options +
- ({ 'label' : 'Overview', 'action' : 'manage_overview' }
- ,
- ))
+ manage_options = ( SimpleItem.manage_options
+ + ({'label': 'Overview',
+ 'action': 'manage_overview'},)
+ )
+
#
# ZMI methods
#
Modified: CMF/trunk/CMFCore/tests/test_MemberDataTool.py
===================================================================
--- CMF/trunk/CMFCore/tests/test_MemberDataTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFCore/tests/test_MemberDataTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -80,10 +80,8 @@
cleanUp()
def test_interfaces(self):
- from Products.CMFCore.interfaces import IActionProvider
from Products.CMFCore.MemberDataTool import MemberDataTool
- verifyClass(IActionProvider, MemberDataTool)
verifyClass(IMemberDataTool, MemberDataTool)
def test_deleteMemberData(self):
Modified: CMF/trunk/CMFCore/tests/test_MembershipTool.py
===================================================================
--- CMF/trunk/CMFCore/tests/test_MembershipTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFCore/tests/test_MembershipTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -38,11 +38,9 @@
class MembershipToolTests(unittest.TestCase):
def test_interfaces(self):
- from Products.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IMembershipTool
from Products.CMFCore.MembershipTool import MembershipTool
- verifyClass(IActionProvider, MembershipTool)
verifyClass(IMembershipTool, MembershipTool)
Modified: CMF/trunk/CMFCore/tests/test_RegistrationTool.py
===================================================================
--- CMF/trunk/CMFCore/tests/test_RegistrationTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFCore/tests/test_RegistrationTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -29,11 +29,9 @@
return RegistrationTool()
def test_interfaces(self):
- from Products.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IRegistrationTool
from Products.CMFCore.RegistrationTool import RegistrationTool
- verifyClass(IActionProvider, RegistrationTool)
verifyClass(IRegistrationTool, RegistrationTool)
def test_generatePassword(self):
Modified: CMF/trunk/CMFCore/tests/test_UndoTool.py
===================================================================
--- CMF/trunk/CMFCore/tests/test_UndoTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFCore/tests/test_UndoTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -24,11 +24,9 @@
class UndoToolTests(unittest.TestCase):
def test_interfaces(self):
- from Products.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IUndoTool
from Products.CMFCore.UndoTool import UndoTool
- verifyClass(IActionProvider, UndoTool)
verifyClass(IUndoTool, UndoTool)
Modified: CMF/trunk/CMFDefault/DiscussionTool.py
===================================================================
--- CMF/trunk/CMFDefault/DiscussionTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFDefault/DiscussionTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -23,7 +23,6 @@
from zope.component import getUtility
from zope.interface import implements
-from Products.CMFCore.ActionProviderBase import ActionProviderBase
from Products.CMFCore.interfaces import IDiscussionResponse
from Products.CMFCore.interfaces import IDiscussionTool
from Products.CMFCore.interfaces import IMembershipTool
@@ -40,7 +39,7 @@
_marker = []
-class DiscussionTool( UniqueObject, SimpleItem, ActionProviderBase ):
+class DiscussionTool(UniqueObject, SimpleItem):
""" Links content to discussions.
"""
@@ -52,10 +51,10 @@
security = ClassSecurityInfo()
- manage_options = (ActionProviderBase.manage_options +
- ({ 'label' : 'Overview', 'action' : 'manage_overview' }
- ,
- ) + SimpleItem.manage_options)
+ manage_options = ( ({'label': 'Overview',
+ 'action': 'manage_overview'},)
+ + SimpleItem.manage_options
+ )
#
# ZMI methods
Modified: CMF/trunk/CMFDefault/MetadataTool.py
===================================================================
--- CMF/trunk/CMFDefault/MetadataTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFDefault/MetadataTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -23,7 +23,6 @@
from OFS.SimpleItem import SimpleItem
from zope.interface import implements
-from Products.CMFCore.ActionProviderBase import ActionProviderBase
from Products.CMFCore.interfaces import IMetadataTool
from Products.CMFCore.utils import registerToolInterface
from Products.CMFCore.utils import UniqueObject
@@ -370,13 +369,12 @@
, ( 'Rights', 0 )
)
-class MetadataTool( UniqueObject, Folder, ActionProviderBase ):
+class MetadataTool(UniqueObject, Folder):
implements(IMetadataTool)
id = 'portal_metadata'
meta_type = 'Default Metadata Tool'
- _actions = ()
_DCMI = None
def _get_DCMI( self ):
@@ -425,9 +423,7 @@
, 'action' : 'manage_overview'
}
)
- + Folder.manage_options[:1]
- + ActionProviderBase.manage_options +
- Folder.manage_options[1:]
+ + Folder.manage_options
)
security.declareProtected(ManagePortal, 'manage_overview')
Modified: CMF/trunk/CMFDefault/PropertiesTool.py
===================================================================
--- CMF/trunk/CMFDefault/PropertiesTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFDefault/PropertiesTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -24,7 +24,6 @@
from zope.component import queryUtility
from zope.interface import implements
-from Products.CMFCore.ActionProviderBase import ActionProviderBase
from Products.CMFCore.interfaces import IPropertiesTool
from Products.CMFCore.interfaces import ISiteRoot
from Products.CMFCore.utils import registerToolInterface
@@ -34,7 +33,7 @@
from utils import _dtmldir
-class PropertiesTool(UniqueObject, SimpleItem, ActionProviderBase):
+class PropertiesTool(UniqueObject, SimpleItem):
implements(IPropertiesTool)
@@ -43,10 +42,9 @@
security = ClassSecurityInfo()
- manage_options = ( ActionProviderBase.manage_options +
- ({ 'label' : 'Overview', 'action' : 'manage_overview' }
- ,
- ) + SimpleItem.manage_options
+ manage_options = ( ({'label': 'Overview',
+ 'action': 'manage_overview'},)
+ + SimpleItem.manage_options
)
#
Modified: CMF/trunk/CMFDefault/SyndicationTool.py
===================================================================
--- CMF/trunk/CMFDefault/SyndicationTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFDefault/SyndicationTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -25,7 +25,6 @@
from OFS.SimpleItem import SimpleItem
from zope.interface import implements
-from Products.CMFCore.ActionProviderBase import ActionProviderBase
from Products.CMFCore.interfaces import ISyndicationTool
from Products.CMFCore.PortalFolder import PortalFolderBase
from Products.CMFCore.utils import _checkPermission
@@ -39,7 +38,7 @@
from utils import _dtmldir
-class SyndicationTool(UniqueObject, SimpleItem, ActionProviderBase):
+class SyndicationTool(UniqueObject, SimpleItem):
"""
The syndication tool manages the site-wide policy for
@@ -61,8 +60,7 @@
max_items = 15
#ZMI Methods
- manage_options = ( ActionProviderBase.manage_options
- + ( { 'label' : 'Overview'
+ manage_options = ( ( { 'label' : 'Overview'
, 'action' : 'overview'
, 'help' : ( 'CMFDefault'
, 'Syndication-Tool_Overview.stx' )
Modified: CMF/trunk/CMFDefault/tests/test_DiscussionTool.py
===================================================================
--- CMF/trunk/CMFDefault/tests/test_DiscussionTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFDefault/tests/test_DiscussionTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -49,11 +49,9 @@
cleanUp()
def test_interfaces(self):
- from Products.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IDiscussionTool
from Products.CMFDefault.DiscussionTool import DiscussionTool
- verifyClass(IActionProvider, DiscussionTool)
verifyClass(IDiscussionTool, DiscussionTool)
def test_overrideDiscussionFor(self):
Modified: CMF/trunk/CMFDefault/tests/test_MembershipTool.py
===================================================================
--- CMF/trunk/CMFDefault/tests/test_MembershipTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFDefault/tests/test_MembershipTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -42,11 +42,9 @@
self.site._setObject( 'portal_membership', self._makeOne() )
def test_interfaces(self):
- from Products.CMFCore.interfaces import IActionProvider
from Products.CMFDefault.interfaces import IMembershipTool
from Products.CMFDefault.MembershipTool import MembershipTool
- verifyClass(IActionProvider, MembershipTool)
verifyClass(IMembershipTool, MembershipTool)
def test_MembersFolder_methods(self):
Modified: CMF/trunk/CMFDefault/tests/test_MetadataTool.py
===================================================================
--- CMF/trunk/CMFDefault/tests/test_MetadataTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFDefault/tests/test_MetadataTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -141,10 +141,8 @@
return Foo(), Bar()
def test_interfaces(self):
- from Products.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IMetadataTool
- verifyClass(IActionProvider, self._getTargetClass())
verifyClass(IMetadataTool, self._getTargetClass())
def test_empty( self ):
Modified: CMF/trunk/CMFDefault/tests/test_PropertiesTool.py
===================================================================
--- CMF/trunk/CMFDefault/tests/test_PropertiesTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFDefault/tests/test_PropertiesTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -24,11 +24,9 @@
class PropertiesToolTests(unittest.TestCase):
def test_interfaces(self):
- from Products.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IPropertiesTool
from Products.CMFDefault.PropertiesTool import PropertiesTool
- verifyClass(IActionProvider, PropertiesTool)
verifyClass(IPropertiesTool, PropertiesTool)
Modified: CMF/trunk/CMFDefault/tests/test_RegistrationTool.py
===================================================================
--- CMF/trunk/CMFDefault/tests/test_RegistrationTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFDefault/tests/test_RegistrationTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -49,10 +49,8 @@
RequestTest.tearDown(self)
def test_interfaces(self):
- from Products.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IRegistrationTool
- verifyClass(IActionProvider, self._getTargetClass())
verifyClass(IRegistrationTool, self._getTargetClass())
def test_spamcannon_collector_243( self ):
Modified: CMF/trunk/CMFDefault/tests/test_SyndicationTool.py
===================================================================
--- CMF/trunk/CMFDefault/tests/test_SyndicationTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFDefault/tests/test_SyndicationTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -45,10 +45,8 @@
SecurityTest.tearDown(self)
def test_interfaces(self):
- from Products.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import ISyndicationTool
- verifyClass(IActionProvider, self._getTargetClass())
verifyClass(ISyndicationTool, self._getTargetClass())
def test_empty(self):
Modified: CMF/trunk/CMFUid/UniqueIdAnnotationTool.py
===================================================================
--- CMF/trunk/CMFUid/UniqueIdAnnotationTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFUid/UniqueIdAnnotationTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -27,7 +27,6 @@
from zope.component import queryUtility
from zope.interface import implements
-from Products.CMFCore.ActionProviderBase import ActionProviderBase
from Products.CMFCore.utils import getToolByName
from Products.CMFCore.utils import registerToolInterface
from Products.CMFCore.utils import UniqueObject
@@ -110,8 +109,7 @@
# assign new uid
uid_handler.register(ob)
-class UniqueIdAnnotationTool(UniqueObject, SimpleItem, PropertyManager,
- ActionProviderBase):
+class UniqueIdAnnotationTool(UniqueObject, SimpleItem, PropertyManager):
__doc__ = __doc__ # copy from module
@@ -119,7 +117,6 @@
manage_options = (
PropertyManager.manage_options +
- ActionProviderBase.manage_options +
SimpleItem.manage_options
)
Modified: CMF/trunk/CMFUid/UniqueIdGeneratorTool.py
===================================================================
--- CMF/trunk/CMFUid/UniqueIdGeneratorTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFUid/UniqueIdGeneratorTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -23,14 +23,13 @@
from OFS.SimpleItem import SimpleItem
from zope.interface import implements
-from Products.CMFCore.ActionProviderBase import ActionProviderBase
from Products.CMFCore.utils import registerToolInterface
from Products.CMFCore.utils import UniqueObject
from Products.CMFUid.interfaces import IUniqueIdGenerator
-class UniqueIdGeneratorTool(UniqueObject, SimpleItem, ActionProviderBase):
+class UniqueIdGeneratorTool(UniqueObject, SimpleItem):
"""Generator of unique ids.
Modified: CMF/trunk/CMFUid/UniqueIdHandlerTool.py
===================================================================
--- CMF/trunk/CMFUid/UniqueIdHandlerTool.py 2007-06-21 13:53:27 UTC (rev 76900)
+++ CMF/trunk/CMFUid/UniqueIdHandlerTool.py 2007-06-21 14:18:54 UTC (rev 76901)
@@ -30,7 +30,6 @@
from zope.component import getUtility
from zope.interface import implements
-from Products.CMFCore.ActionProviderBase import ActionProviderBase
from Products.CMFCore.permissions import ManagePortal
from Products.CMFCore.utils import getToolByName
from Products.CMFCore.utils import UniqueObject
@@ -47,7 +46,7 @@
_wwwdir = os.path.join( package_home( globals() ), 'www' )
-class UniqueIdHandlerTool(UniqueObject, SimpleItem, ActionProviderBase):
+class UniqueIdHandlerTool(UniqueObject, SimpleItem):
__doc__ = __doc__ # copy from module
@@ -56,11 +55,8 @@
id = 'portal_uidhandler'
- manage_options = ( ActionProviderBase.manage_options
- + ( {'label':'Query',
- 'action':'manage_queryObject'}
- ,
- )
+ manage_options = ( ({'label': 'Query',
+ 'action': 'manage_queryObject'},)
+ SimpleItem.manage_options
)
More information about the CMF-checkins
mailing list