[Erp5-report] r29638 - /erp5/trunk/products/ERP5Type/patches/ActionsTool.py

[nobody at svn.erp5.org]

Author: jm
Date: Wed Oct 14 11:39:21 2009
New Revision: 29638

URL: http://svn.erp5.org?rev=29638&view=rev
Log:
Fix use of IActionProvider in ActionsTool patches for Zope 2.12

Modified:
    erp5/trunk/products/ERP5Type/patches/ActionsTool.py

Modified: erp5/trunk/products/ERP5Type/patches/ActionsTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/patches/ActionsTool.py?rev=29638&r1=29637&r2=29638&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/ActionsTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/patches/ActionsTool.py [utf8] Wed Oct 14 11:39:21 2009
@@ -12,7 +12,14 @@
 #
 ##############################################################################
 
-from Products.CMFCore.ActionsTool import ActionsTool, IActionProvider
+from Products.CMFCore.ActionsTool import ActionsTool
+try:
+  from Products.CMFCore.interfaces import IActionProvider
+  providedBy = IActionProvider.providedBy
+except ImportError:
+  # XXX Do not initialize ZCML in unit tests on Zope 2.8 for the moment
+  from Products.CMFCore.ActionsTool import IActionProvider
+  providedBy = IActionProvider.isImplementedBy
 
 ActionsTool_listFilteredActionsFor = ActionsTool.listFilteredActionsFor
 
@@ -27,7 +34,7 @@
     # Include actions from specific tools.
     for provider_name in self.listActionProviders():
         provider = getattr(self, provider_name)
-        if IActionProvider.isImplementedBy(provider):
+        if providedBy(provider):
             actions.extend( provider.listActionInfos(object=object) )
         elif hasattr(provider, 'getFilteredActionListFor'):
             from Products.ERP5Type.Utils import createExpressionContext