[CMF-checkins] CVS: Products/CMFCore - ActionInformation.py:1.26.2.1

[Yvo Schubbe]

Update of /cvs-repository/Products/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv30450/CMFCore

Modified Files:
      Tag: CMF-1_5-branch
	ActionInformation.py 
Log Message:
backported change from HEAD:
- fixed ActionInfo issue regarding permissions in oldstyle action dicts


=== Products/CMFCore/ActionInformation.py 1.26 => 1.26.2.1 ===
--- Products/CMFCore/ActionInformation.py:1.26	Thu Aug 12 11:07:39 2004
+++ Products/CMFCore/ActionInformation.py	Tue Jan 25 15:10:24 2005
@@ -22,8 +22,8 @@
 from Globals import InitializeClass
 from OFS.SimpleItem import SimpleItem
 
-from interfaces.portal_actions import ActionInfo as IActionInfo
 from Expression import Expression
+from interfaces.portal_actions import ActionInfo as IActionInfo
 from permissions import View
 from utils import _checkPermission
 from utils import getToolByName
@@ -34,7 +34,9 @@
 class ActionInfo(UserDict):
     """ A lazy dictionary for Action infos.
     """
+
     __implements__ = IActionInfo
+
     __allow_access_to_unprotected_subobjects__ = 1
 
     def __init__(self, action, ec):
@@ -52,7 +54,6 @@
 
         else:
             self._action = action
-            self._ec = ec
             UserDict.__init__( self, action.getMapping() )
             self.data['name'] = self.data['title']
             del self.data['description']
@@ -77,6 +78,7 @@
         else:
             self.data['allowed'] = True
 
+        self._ec = ec
         self._lazy_keys = lazy_keys
 
     def __getitem__(self, key):