Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv1012/CMFCore
Modified Files:
Tag: yuppie-collector067-branch
ActionProviderBase.py URLTool.py
Log Message:
cleanup:
- listActions() doesn't belong to the portal_url interface
- no need to override listActions in URLTool
- added __implements__ to ActionProviderBase
=== CMF/CMFCore/ActionProviderBase.py 1.13 => 1.13.16.1 ===
--- CMF/CMFCore/ActionProviderBase.py:1.13 Sat Jul 6 18:47:48 2002
+++ CMF/CMFCore/ActionProviderBase.py Tue Nov 26 10:04:58 2002
@@ -24,11 +24,16 @@
from Expression import Expression
from utils import _dtmldir
+from interfaces.portal_actions import ActionProvider as IActionProvider
+
class ActionProviderBase:
""" Provide ActionTabs and management methods for ActionProviders
"""
+
+ __implements__ = IActionProvider
+
security = ClassSecurityInfo()
_actions = ()
=== CMF/CMFCore/URLTool.py 1.1.2.1 => 1.1.2.2 ===
--- CMF/CMFCore/URLTool.py:1.1.2.1 Sun Nov 24 19:10:52 2002
+++ CMF/CMFCore/URLTool.py Tue Nov 26 10:04:58 2002
@@ -32,8 +32,10 @@
class URLTool(UniqueObject, SimpleItem, ActionProviderBase):
+ """ CMF URL Tool.
+ """
- __implements__ = IURLTool
+ __implements__ = (IURLTool, ActionProviderBase.__implements__)
id = 'portal_url'
meta_type = 'CMF URL Tool'
@@ -64,12 +66,6 @@
""" Get by default the absolute URL of the portal.
"""
return self.getPortalObject().absolute_url(relative=relative)
-
- security.declarePrivate('listActions')
- def listActions(self, info=None):
- """ List actions provided via the tool.
- """
- return self._actions
security.declarePublic('getPortalObject')
def getPortalObject(self):