[CMF-checkins] CVS: CMF/CMFSetup - actions.py:1.11

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFSetup
In directory cvs.zope.org:/tmp/cvs-serv8720/CMFSetup

Modified Files:
	actions.py 
Log Message:
- merged yuppie-apb-redo-branch:

      o Removed again OldstyleActionProvider Interface and
        OldstyleActionProviderBase that existed only in 1.5.0-alpha.
        ActionProvider now also works with oldstyle Action mappings.

      o listActionInfos() and getActionInfo() now return ActionInfo objects
        instead of Action info mappings. ActionInfo objects have a backwards
        compatible mapping interface.

(hope there are no issues with this checkin, I'll be AFK the next 4 days)


=== CMF/CMFSetup/actions.py 1.10 => 1.11 ===
--- CMF/CMFSetup/actions.py:1.10	Mon Jul 19 14:11:36 2004
+++ CMF/CMFSetup/actions.py	Mon Jul 26 06:13:14 2004
@@ -11,7 +11,6 @@
 
 from Products.CMFCore.ActionInformation import ActionInformation
 from Products.CMFCore.ActionProviderBase import IActionProvider
-from Products.CMFCore.ActionProviderBase import IOldstyleActionProvider
 from Products.CMFCore.utils import getToolByName
 
 from permissions import ManagePortal
@@ -151,10 +150,11 @@
             if not IActionProvider.isImplementedBy( provider ):
                 continue
 
-            if IOldstyleActionProvider.isImplementedBy( provider ):
+            actions = provider.listActions()
+
+            if actions and isinstance(actions[0], dict):
                 continue
 
-            actions = provider.listActions()
             provider_info['actions'] = [ ai.getMapping() for ai in actions ]
 
         return result