more eggs & update patch

component/egg-patch/Products.DCWorkflow/workflow_method.patch

 diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/DCWorkflow.py
 --- Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py	2011-11-01 18:55:01.000000000 +0100
 +++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/DCWorkflow.py	2013-10-31 16:42:05.021141352 +0100
-@@ -40,6 +40,7 @@
- from Products.DCWorkflow.permissions import ManagePortal
+@@ -38,6 +38,7 @@
+ from Products.DCWorkflow.interfaces import IDCWorkflowDefinition
  from Products.DCWorkflow.Transitions import TRIGGER_AUTOMATIC
  from Products.DCWorkflow.Transitions import TRIGGER_USER_ACTION
 +from Products.DCWorkflow.Transitions import TRIGGER_WORKFLOW_METHOD
  from Products.DCWorkflow.utils import Message as _
  from Products.DCWorkflow.utils import modifyRolesForGroup
  from Products.DCWorkflow.utils import modifyRolesForPermission
-@@ -281,6 +282,52 @@
-             raise Unauthorized(action)
+@@ -279,6 +280,52 @@
          self._changeStateOf(ob, tdef, kw)
  
-+    security.declarePrivate('isWorkflowMethodSupported')
+     @security.private
 +    def isWorkflowMethodSupported(self, ob, method_id):
 +        '''
 +        Returns a true value if the given workflow method
@@ -30,7 +29,7 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py Products.D
 +                return 1
 +        return 0
 +
-+    security.declarePrivate('wrapWorkflowMethod')
++    @security.private
 +    def wrapWorkflowMethod(self, ob, method_id, func, args, kw):
 +        '''
 +        Allows the user to request a workflow action.  This method
@@ -59,9 +58,10 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py Products.D
 +            raise ObjectMoved(ex.getNewObject(), res)
 +        return res
 +
-     security.declarePrivate('isInfoSupported')
++    @security.private
      def isInfoSupported(self, ob, name):
          '''
+         Returns a true value if the given info name is supported.
 diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transition_properties.dtml Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transition_properties.dtml
 --- Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transition_properties.dtml	2011-11-01 18:55:01.000000000 +0100
 +++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transition_properties.dtml	2013-10-31 16:42:05.021141352 +0100
@@ -98,12 +98,12 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transitions.dtml Pr
 diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/exportimport.py Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/exportimport.py
 --- Products.DCWorkflow-2.2.4/Products/DCWorkflow/exportimport.py	2011-11-01 18:55:01.000000000 +0100
 +++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/exportimport.py	2013-10-31 16:42:09.221141578 +0100
-@@ -34,7 +34,7 @@
- from Products.GenericSetup.interfaces import ISetupEnviron
- from Products.GenericSetup.utils import BodyAdapterBase
+@@ -40,7 +40,7 @@
+ from Products.DCWorkflow.utils import _xmldir
  
--TRIGGER_TYPES = ( 'AUTOMATIC', 'USER' )
-+TRIGGER_TYPES = ( 'AUTOMATIC', 'USER', 'METHOD' )
+ 
+-TRIGGER_TYPES = ('AUTOMATIC', 'USER')
++TRIGGER_TYPES = ('AUTOMATIC', 'USER', 'METHOD')
  _FILENAME = 'workflows.xml'
  
  

stack/erp5/buildout-py3.cfg

@@ -21,12 +21,26 @@ eggs =
     Paste
     ZEO
 # Former zope dependencies
+    pylint
     zLOG
     docutils
     Missing
     pytz
     zope.sendmail
     zope.structuredtext
+    Products.CMFCore
+#Products.BTreeFolder2 
+#Products.ExternalMethod 
+#Products.MIMETools 
+    Products.PythonScripts 
+    Products.SiteErrorLog 
+    Products.DCWorkflow
+#Products.StandardCacheManagers 
+#Products.ZCatalog 
+#Record
+Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.DCWorkflow/workflow_method.patch#975b49e96bae33ac8563454fe5fa9899
+Products.DCWorkflow-patch-options = -p1
+
 
 [python]
 part = python3
@@ -156,18 +170,6 @@ eggs -=
   pytesseract
 #  ${neoppod:eggs}
 
-eggs +=
-  Zope
-  Paste
-  zLOG
-  docutils
-  Missing
-  pytz
-  zope.sendmail
-  zope.structuredtext
-  pylint
-  Products.CMFCore
-
 Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acquisition/aq_dynamic-4.5.patch#e923ab436d53282df536de3ef7d3e127
 
 [pylint]
@@ -197,3 +199,13 @@ python-ldap = 3.1.0
 ipython = 0.10.2
 cryptography = 3.2.1
 Products.CMFCore = 2.4.8
+Products.MailHost = 4.0
+Products.GenericSetup = 2.0
+mccabe = 0.6
+isort = 4.2.5
+astroid = 2.4.0
+wrapt = 1.11
+typed-ast = 1.4.0
+Products.SiteErrorLog = 5.4
+Products.PythonScripts = 4.12
+Products.DCWorkflow = 2.4.0+SlapOSPatched001
\ No newline at end of file

stack/erp5/zope-versions.cfg

@@ -16,7 +16,7 @@ Persistence = 2.13.2
 Products.BTreeFolder2 = 2.13.5
 Products.ExternalMethod = 2.13.1
 Products.MIMETools = 2.13.0
-Products.MailHost = 2.13.4
+#Products.MailHost = 2.13.4
 Products.OFSP = 2.13.2
 Products.PythonScripts = 2.13.2
 Products.Sessions = 3.0