[CMF-checkins] CVS: CMF/DCWorkflow - ContainerTab.py:1.5.20.1 DCWorkflow.py:1.24.4.2 Default.py:1.13.18.1 Expression.py:1.12.20.1 Guard.py:1.7.18.1 Scripts.py:1.3.20.1 States.py:1.8.18.1 Transitions.py:1.9.18.1 Variables.py:1.6.18.1 WorkflowUIMixin.py:1.4.20.1 Worklists.py:1.8.18.1 __init__.py:1.5.20.1 utils.py:1.4.20.1 version.txt:1.8.10.6

Sidnei da Silva sidnei at awkly.org
Thu Apr 22 13:48:35 EDT 2004


Update of /cvs-repository/CMF/DCWorkflow
In directory cvs.zope.org:/tmp/cvs-serv30596/DCWorkflow

Modified Files:
      Tag: CMF-1_4-branch
	ContainerTab.py DCWorkflow.py Default.py Expression.py 
	Guard.py Scripts.py States.py Transitions.py Variables.py 
	WorkflowUIMixin.py Worklists.py __init__.py utils.py 
	version.txt 
Log Message:
Fix version.txt to right version. Run reindent.py for removing extra tabs and whitespaces


=== CMF/DCWorkflow/ContainerTab.py 1.5 => 1.5.20.1 ===
--- CMF/DCWorkflow/ContainerTab.py:1.5	Thu Aug  1 15:05:14 2002
+++ CMF/DCWorkflow/ContainerTab.py	Thu Apr 22 13:47:58 2004
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 """ A convenient base class for representing a container as a management tab.
 
@@ -116,4 +116,3 @@
         if REQUEST is not None:
             return self.manage_main(REQUEST)
         return None
-


=== CMF/DCWorkflow/DCWorkflow.py 1.24.4.1 => 1.24.4.2 ===
--- CMF/DCWorkflow/DCWorkflow.py:1.24.4.1	Mon Dec 15 07:15:14 2003
+++ CMF/DCWorkflow/DCWorkflow.py	Thu Apr 22 13:47:58 2004
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 """ Web-configurable workflow.
 
@@ -426,7 +426,7 @@
                     tdef = t
                     break
         return tdef
-        
+
     def _changeStateOf(self, ob, tdef=None, kwargs=None):
         '''
         Changes state.  Can execute multiple transitions if there are


=== CMF/DCWorkflow/Default.py 1.13 => 1.13.18.1 ===
--- CMF/DCWorkflow/Default.py:1.13	Thu Oct 17 15:38:37 2002
+++ CMF/DCWorkflow/Default.py	Thu Apr 22 13:47:58 2004
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 """ Programmatically creates a workflow.
 
@@ -172,7 +172,7 @@
                        actbox_url='%(portal_url)s/search?review_state=pending',
                        props={'var_match_review_state':'pending',
                               'guard_permissions':p_review})
-    
+
 
 def createDefaultWorkflowRev2(id):
     '''
@@ -304,7 +304,7 @@
                        actbox_url='%(portal_url)s/search?review_state=pending',
                        props={'var_match_review_state':'pending',
                               'guard_permissions':p_review})
-    
+
 
 
 def createDefaultWorkflowClassic(id):
@@ -316,4 +316,3 @@
 
 addWorkflowFactory(createDefaultWorkflowClassic, id='default_workflow',
                    title='Web-configurable workflow [Classic]')
-


=== CMF/DCWorkflow/Expression.py 1.12 => 1.12.20.1 ===
--- CMF/DCWorkflow/Expression.py:1.12	Thu Aug  1 15:05:14 2002
+++ CMF/DCWorkflow/Expression.py	Thu Apr 22 13:47:58 2004
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 """ Expressions in a web-configurable workflow.
 
@@ -114,4 +114,3 @@
         'scripts':      wf.scripts,
         }
     return getEngine().getContext(data)
-


=== CMF/DCWorkflow/Guard.py 1.7 => 1.7.18.1 ===
--- CMF/DCWorkflow/Guard.py:1.7	Thu Oct 17 15:31:00 2002
+++ CMF/DCWorkflow/Guard.py	Thu Apr 22 13:47:58 2004
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 """ Guard conditions in a web-configurable workflow.
 


=== CMF/DCWorkflow/Scripts.py 1.3 => 1.3.20.1 ===
--- CMF/DCWorkflow/Scripts.py:1.3	Thu Aug  1 15:05:14 2002
+++ CMF/DCWorkflow/Scripts.py	Thu Apr 22 13:47:58 2004
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 """ Scripts in a web-configurable workflow.
 


=== CMF/DCWorkflow/States.py 1.8 => 1.8.18.1 ===
--- CMF/DCWorkflow/States.py:1.8	Thu Nov  7 06:25:26 2002
+++ CMF/DCWorkflow/States.py	Thu Apr 22 13:47:58 2004
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 """ States in a web-configurable workflow.
 
@@ -132,14 +132,14 @@
             return []
         else:
             return vv.items()
-    
+
     def getWorkflowVariables(self):
         ''' get all variables that are available form
             workflow and not handled yet.
         '''
         wf_vars = self.getAvailableVarIds()
         if self.var_values is None:
-                return wf_vars
+            return wf_vars
         ret = []
         for vid in wf_vars:
             if not self.var_values.has_key(vid):
@@ -151,12 +151,12 @@
         '''
         if self.var_values is None:
             self.var_values = PersistentMapping()
-        
+
         self.var_values[id] = value
-        
+
         if REQUEST is not None:
             return self.manage_variables(REQUEST, 'Variable added.')
-    
+
     def deleteVariables(self,ids=[],REQUEST=None):
         ''' delete a WorkflowVariable from State
         '''
@@ -164,7 +164,7 @@
         for id in ids:
             if vv.has_key(id):
                 del vv[id]
-                
+
         if REQUEST is not None:
             return self.manage_variables(REQUEST, 'Variables deleted.')
 
@@ -173,9 +173,9 @@
         '''
         if self.var_values is None:
             self.var_values = PersistentMapping()
- 
+
         vv = self.var_values
- 
+
         if REQUEST is not None:
             for id in vv.keys():
                 fname = 'varval_%s' % id
@@ -189,7 +189,7 @@
     def manage_permissions(self, REQUEST, manage_tabs_message=None):
         '''
         '''
-        
+
         return self._permissions_form(REQUEST,
                                      management_view='Permissions',
                                      manage_tabs_message=manage_tabs_message,


=== CMF/DCWorkflow/Transitions.py 1.9 => 1.9.18.1 ===
--- CMF/DCWorkflow/Transitions.py:1.9	Thu Nov  7 06:25:26 2002
+++ CMF/DCWorkflow/Transitions.py	Thu Apr 22 13:47:58 2004
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 """ Transitions in a web-configurable workflow.
 
@@ -154,14 +154,14 @@
             for key in ve.keys():
                 ret.append((key,self.getVarExprText(key)))
             return ret
-    
+
     def getWorkflowVariables(self):
         ''' get all variables that are available form
             workflow and not handled yet.
         '''
         wf_vars = self.getAvailableVarIds()
         if self.var_exprs is None:
-                return wf_vars
+            return wf_vars
         ret = []
         for vid in wf_vars:
             if not self.var_exprs.has_key(vid):
@@ -174,15 +174,15 @@
         '''
         if self.var_exprs is None:
             self.var_exprs = PersistentMapping()
-        
+
         expr = None
         if text:
-          expr = Expression(str(text))
+            expr = Expression(str(text))
         self.var_exprs[id] = expr
-        
+
         if REQUEST is not None:
             return self.manage_variables(REQUEST, 'Variable added.')
-    
+
     def deleteVariables(self,ids=[],REQUEST=None):
         ''' delete a WorkflowVariable from State
         '''
@@ -190,7 +190,7 @@
         for id in ids:
             if ve.has_key(id):
                 del ve[id]
-                
+
         if REQUEST is not None:
             return self.manage_variables(REQUEST, 'Variables deleted.')
 
@@ -199,9 +199,9 @@
         '''
         if self.var_exprs is None:
             self.var_exprs = PersistentMapping()
- 
+
         ve = self.var_exprs
- 
+
         if REQUEST is not None:
             for id in ve.keys():
                 fname = 'varexpr_%s' % id


=== CMF/DCWorkflow/Variables.py 1.6 => 1.6.18.1 ===
--- CMF/DCWorkflow/Variables.py:1.6	Thu Oct 17 15:31:00 2002
+++ CMF/DCWorkflow/Variables.py	Thu Apr 22 13:47:58 2004
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 """ Variables in a web-configurable workflow.
 
@@ -93,7 +93,7 @@
             self.default_expr = Expression(default_expr)
         else:
             self.default_expr = None
-            
+
         g = Guard()
         if g.changeFromProperties(props or REQUEST):
             self.info_guard = g


=== CMF/DCWorkflow/WorkflowUIMixin.py 1.4 => 1.4.20.1 ===
--- CMF/DCWorkflow/WorkflowUIMixin.py:1.4	Thu Aug  1 15:05:14 2002
+++ CMF/DCWorkflow/WorkflowUIMixin.py	Thu Apr 22 13:47:58 2004
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 """ Web-configurable workflow UI.
 


=== CMF/DCWorkflow/Worklists.py 1.8 => 1.8.18.1 ===
--- CMF/DCWorkflow/Worklists.py:1.8	Fri Oct 25 11:49:47 2002
+++ CMF/DCWorkflow/Worklists.py	Thu Apr 22 13:47:58 2004
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 """ Worklists in a web-configurable workflow.
 


=== CMF/DCWorkflow/__init__.py 1.5 => 1.5.20.1 ===
--- CMF/DCWorkflow/__init__.py:1.5	Thu Aug  1 15:05:14 2002
+++ CMF/DCWorkflow/__init__.py	Thu Apr 22 13:47:58 2004
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 """ Web-configurable workflow.
 
@@ -21,10 +21,10 @@
 
 
 def initialize(context):
-    
+
     context.registerHelp(directory='help')
     context.registerHelpTitle('DCWorkflow')
-    
+
     registerIcon(DCWorkflow.DCWorkflowDefinition,
                  'images/workflow.gif', globals())
     registerIcon(States.States,


=== CMF/DCWorkflow/utils.py 1.4 => 1.4.20.1 ===
--- CMF/DCWorkflow/utils.py:1.4	Thu Aug  1 15:05:14 2002
+++ CMF/DCWorkflow/utils.py	Thu Apr 22 13:47:58 2004
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 """ Some common utilities.
 
@@ -32,13 +32,13 @@
     for p in perms: d[p[0]] = None
     r = gather_permissions(ob.__class__, [], d)
     if all:
-       if hasattr(ob, '_subobject_permissions'):
-           for p in ob._subobject_permissions():
-               pname=p[0]
-               if not d.has_key(pname):
-                   d[pname]=1
-                   r.append(p)
-       r = list(perms) + r
+        if hasattr(ob, '_subobject_permissions'):
+            for p in ob._subobject_permissions():
+                pname=p[0]
+                if not d.has_key(pname):
+                    d[pname]=1
+                    r.append(p)
+        r = list(perms) + r
     return r
 
 def modifyRolesForPermission(ob, pname, roles):


=== CMF/DCWorkflow/version.txt 1.8.10.5 => 1.8.10.6 ===
--- CMF/DCWorkflow/version.txt:1.8.10.5	Thu Feb  5 01:06:36 2004
+++ CMF/DCWorkflow/version.txt	Thu Apr 22 13:47:58 2004
@@ -1 +1 @@
-CMF-1.4.3-rc1
+CMF-1.4.3




More information about the CMF-checkins mailing list