[Checkins] SVN: Products.CMFCore/branches/adapterize-wfstatus-wfhistory/Products/CMFCore/ Workflow storage adapters adapt IWorkflowAware

[Laurence Rowe]

Log message for revision 116985:
  Workflow storage adapters adapt IWorkflowAware

Changed:
  U   Products.CMFCore/branches/adapterize-wfstatus-wfhistory/Products/CMFCore/WorkflowTool.py
  U   Products.CMFCore/branches/adapterize-wfstatus-wfhistory/Products/CMFCore/tests/test_WorkflowTool.py

-=-
Modified: Products.CMFCore/branches/adapterize-wfstatus-wfhistory/Products/CMFCore/WorkflowTool.py
===================================================================
--- Products.CMFCore/branches/adapterize-wfstatus-wfhistory/Products/CMFCore/WorkflowTool.py	2010-09-27 13:31:45 UTC (rev 116984)
+++ Products.CMFCore/branches/adapterize-wfstatus-wfhistory/Products/CMFCore/WorkflowTool.py	2010-09-27 16:51:24 UTC (rev 116985)
@@ -34,8 +34,8 @@
 from zope.component import queryMultiAdapter
 
 from Products.CMFCore.ActionProviderBase import ActionProviderBase
-from Products.CMFCore.interfaces import IContentish
 from Products.CMFCore.interfaces import IConfigurableWorkflowTool
+from Products.CMFCore.interfaces import IWorkflowAware
 from Products.CMFCore.interfaces import IWorkflowDefinition
 from Products.CMFCore.interfaces import IWorkflowHistory
 from Products.CMFCore.interfaces import IWorkflowStatus
@@ -621,7 +621,7 @@
 
 class DefaultWorkflowStatus(object):
     implements(IWorkflowStatus)
-    adapts(IContentish, IWorkflowDefinition)
+    adapts(IWorkflowAware, IWorkflowDefinition)
 
     def __init__(self, context, workflow):
         self.context = aq_base(context)
@@ -644,7 +644,7 @@
 
 
 @implementer(IWorkflowHistory)
- at adapter(IContentish, IWorkflowDefinition)
+ at adapter(IWorkflowAware, IWorkflowDefinition)
 def default_workflow_history(context, workflow):
         history = getattr(aq_base(context), 'workflow_history', {})
         return history.get(workflow.getId(), ())

Modified: Products.CMFCore/branches/adapterize-wfstatus-wfhistory/Products/CMFCore/tests/test_WorkflowTool.py
===================================================================
--- Products.CMFCore/branches/adapterize-wfstatus-wfhistory/Products/CMFCore/tests/test_WorkflowTool.py	2010-09-27 13:31:45 UTC (rev 116984)
+++ Products.CMFCore/branches/adapterize-wfstatus-wfhistory/Products/CMFCore/tests/test_WorkflowTool.py	2010-09-27 16:51:24 UTC (rev 116985)
@@ -27,6 +27,7 @@
 from Products.CMFCore.interfaces import IActionSucceededEvent
 from Products.CMFCore.interfaces import IActionWillBeInvokedEvent
 from Products.CMFCore.interfaces import IContentish
+from Products.CMFCore.interfaces import IWorkflowAware
 from Products.CMFCore.interfaces import IWorkflowDefinition
 from Products.CMFCore.testing import TraversingEventZCMLLayer
 
@@ -125,7 +126,7 @@
 
 class DummyContent( Dummy ):
 
-    implements(IContentish)
+    implements(IContentish, IWorkflowAware)
     meta_type = 'Dummy'
 
     def getPortalTypeName(self):