[Checkins] SVN: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/ sync with trunk
Leonardo Rochael Almeida
leorochael at gmail.com
Fri Sep 17 08:46:32 EDT 2010
Log message for revision 116517:
sync with trunk
Changed:
A Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/COPYRIGHT.txt
A Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/LICENSE.txt
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/CHANGES.txt
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/COPYRIGHT.txt
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/ContainerTab.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/DCWorkflow.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Expression.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Extensions/test_method.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Guard.py
D Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/LICENSE.txt
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Scripts.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/States.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Transitions.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Variables.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/WorkflowUIMixin.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Worklists.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/__init__.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/browser/__init__.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/browser/workflow.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/exportimport.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/interfaces.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/testing.py
UU Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_DCWorkflow.py
UU Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_exportimport.py
UU Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_guard.py
UU Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_roles.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/utils.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/version.txt
UU Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/xml/wtcWorkflowExport.xml
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/setup.py
-=-
Copied: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/COPYRIGHT.txt (from rev 116504, Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow-mergepoint1/COPYRIGHT.txt)
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/COPYRIGHT.txt (rev 0)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/COPYRIGHT.txt 2010-09-17 12:46:31 UTC (rev 116517)
@@ -0,0 +1 @@
+Zope Foundation and Contributors
\ No newline at end of file
Copied: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/LICENSE.txt (from rev 116504, Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow-mergepoint1/LICENSE.txt)
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/LICENSE.txt (rev 0)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/LICENSE.txt 2010-09-17 12:46:31 UTC (rev 116517)
@@ -0,0 +1,44 @@
+Zope Public License (ZPL) Version 2.1
+
+A copyright notice accompanies this license document that identifies the
+copyright holders.
+
+This license has been certified as open source. It has also been designated as
+GPL compatible by the Free Software Foundation (FSF).
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions in source code must retain the accompanying copyright
+notice, this list of conditions, and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the accompanying copyright
+notice, this list of conditions, and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+3. Names of the copyright holders must not be used to endorse or promote
+products derived from this software without prior written permission from the
+copyright holders.
+
+4. The right to distribute this software or to use it for any purpose does not
+give you the right to use Servicemarks (sm) or Trademarks (tm) of the
+copyright
+holders. Use of them is covered by separate agreement with the copyright
+holders.
+
+5. If any files are modified, you must cause the modified files to carry
+prominent notices stating that you changed the files and the date of any
+change.
+
+Disclaimer
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/CHANGES.txt
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/CHANGES.txt 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/CHANGES.txt 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,9 +1,21 @@
Products.DCWorkflow Changelog
=============================
-2.2.0 (unreleased)
-------------------
+2.3.0-alpha (unreleased)
+------------------------
+- Deal with deprecation warnings for Zope 2.13.
+
+
+2.2.0-beta (2009-12-06)
+-----------------------
+
+- no changes from version 2.2.0-alpha
+
+
+2.2.0-alpha (2009-11-13)
+------------------------
+
- moved the Zope dependency to version 2.12.0b3dev
- Worklists: The catalog variable match setting can now be a
@@ -39,9 +51,16 @@
BBB conditional import.
-2.1.2-beta (2008-08-26)
+2.1.2 (2008-09-13)
------------------
+- test fixture: Fix failng tests with GenericSetup > 1.3 by explicitly
+ loading GS' meta.zcml during setup.
+
+
+2.1.2-beta (2008-08-26)
+-----------------------
+
- completed devolution from monolithic CMF package into its component
products that are distributed as eggs from PyPI.
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/COPYRIGHT.txt
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/COPYRIGHT.txt 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/COPYRIGHT.txt 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,4 +1,4 @@
-Copyright (c) 2008 Zope Corporation (TM) and Contributors.
+Copyright (c) 2008 Zope Foundation and Contributors.
All Rights Reserved.
This software is subject to the provisions of the Zope Public License,
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/ContainerTab.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/ContainerTab.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/ContainerTab.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/DCWorkflow.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/DCWorkflow.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/DCWorkflow.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Expression.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Expression.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Expression.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Extensions/test_method.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Extensions/test_method.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Extensions/test_method.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2005 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2005 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Guard.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Guard.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Guard.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
Deleted: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/LICENSE.txt
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/LICENSE.txt 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/LICENSE.txt 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,53 +0,0 @@
-Zope Public License (ZPL) Version 2.1
-
-A copyright notice accompanies this license document that
-identifies the copyright holders.
-
-This license has been certified as open source. It has also
-been designated as GPL compatible by the Free Software
-Foundation (FSF).
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the
-following conditions are met:
-
-1. Redistributions in source code must retain the
- accompanying copyright notice, this list of conditions,
- and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the accompanying
- copyright notice, this list of conditions, and the
- following disclaimer in the documentation and/or other
- materials provided with the distribution.
-
-3. Names of the copyright holders must not be used to
- endorse or promote products derived from this software
- without prior written permission from the copyright
- holders.
-
-4. The right to distribute this software or to use it for
- any purpose does not give you the right to use
- Servicemarks (sm) or Trademarks (tm) of the copyright
- holders. Use of them is covered by separate agreement
- with the copyright holders.
-
-5. If any files are modified, you must cause the modified
- files to carry prominent notices stating that you changed
- the files and the date of any change.
-
-Disclaimer
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
- AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- NO EVENT SHALL THE COPYRIGHT HOLDERS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- DAMAGE.
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Scripts.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Scripts.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Scripts.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/States.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/States.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/States.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Transitions.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Transitions.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Transitions.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Variables.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Variables.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Variables.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/WorkflowUIMixin.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/WorkflowUIMixin.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/WorkflowUIMixin.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Worklists.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Worklists.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Worklists.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/__init__.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/__init__.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/__init__.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/browser/__init__.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/browser/__init__.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/browser/__init__.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2005 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2005 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/browser/workflow.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/browser/workflow.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/browser/workflow.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2005 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2005 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/exportimport.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/exportimport.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/exportimport.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2005 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2005 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
@@ -232,7 +232,7 @@
'script_info' -- a list of mappings describing the scripts which
provide added business logic (see '_extractScripts').
"""
- workflow_info[ 'manager_bypass' ] = workflow.manager_bypass
+ workflow_info[ 'manager_bypass' ] = bool(workflow.manager_bypass)
workflow_info[ 'creation_guard' ] = self._extractCreationGuard(workflow)
workflow_info[ 'state_variable' ] = workflow.state_var
workflow_info[ 'initial_state' ] = workflow.initial_state
@@ -1011,7 +1011,7 @@
"""
workflow.title = title
workflow.description = description
- workflow.manager_bypass = manager_bypass
+ workflow.manager_bypass = manager_bypass and 1 or 0
workflow.state_var = state_variable
workflow.initial_state = initial_state
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/interfaces.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/interfaces.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/interfaces.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2005 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2005 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/testing.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/testing.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/testing.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2006 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
@@ -15,13 +15,18 @@
$Id$
"""
-from Products.Five import zcml
from Testing.ZopeTestCase.layer import ZopeLite
from zope.testing.cleanup import cleanUp
from Products.CMFCore.testing import _DUMMY_ZCML
+# BBB for Zope 2.12
+try:
+ from Zope2.App import zcml
+except ImportError:
+ from Products.Five import zcml
+
class ExportImportZCMLLayer(ZopeLite):
@classmethod
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_DCWorkflow.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_DCWorkflow.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_DCWorkflow.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2003 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2003 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
@@ -11,8 +11,6 @@
#
##############################################################################
""" Unit tests for DCWorkflow module.
-
-$Id$
"""
import unittest
@@ -184,7 +182,3 @@
return unittest.TestSuite((
unittest.makeSuite(DCWorkflowDefinitionTests),
))
-
-if __name__ == '__main__':
- from Products.CMFCore.testing import run
- run(test_suite())
Property changes on: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_DCWorkflow.py
___________________________________________________________________
Deleted: svn:keywords
- Author Date Id Revision
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_exportimport.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_exportimport.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_exportimport.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2004 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2004 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
@@ -11,8 +11,6 @@
#
##############################################################################
"""DCWorkflow export / import unit tests.
-
-$Id$
"""
import unittest
@@ -1331,7 +1329,7 @@
description="%s"
state_variable="state"
initial_state="%s"
- manager_bypass="0">
+ manager_bypass="False">
</dc-workflow>
"""
@@ -1344,7 +1342,7 @@
title="%(title)s"
state_variable="state"
initial_state="%(initial_state)s"
- manager_bypass="0">
+ manager_bypass="False">
<permission>Open content for modifications</permission>
<permission>Modify content</permission>
<permission>Query history</permission>
@@ -1589,7 +1587,7 @@
description="%(description)s"
state_variable="state"
initial_state="%(initial_state)s"
- manager_bypass="0">
+ manager_bypass="False">
<permission>Open content for modifications</permission>
<permission>Modify content</permission>
<permission>Query history</permission>
@@ -1839,7 +1837,7 @@
description="%s"
state_variable="state"
initial_state="%s"
- manager_bypass="1">
+ manager_bypass="True">
<instance-creation-conditions>
<guard>
<guard-permission>Add portal content</guard-permission>
@@ -2549,13 +2547,10 @@
self.assertEqual(scripts['doc'].meta_type, 'DTML Document')
self.assertEqual(scripts['bar'].meta_type, 'Script (Python)')
+
def test_suite():
return unittest.TestSuite((
unittest.makeSuite( WorkflowDefinitionConfiguratorTests ),
unittest.makeSuite( Test_exportWorkflow ),
unittest.makeSuite( Test_importWorkflow ),
))
-
-if __name__ == '__main__':
- from Products.CMFCore.testing import run
- run(test_suite())
Property changes on: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_exportimport.py
___________________________________________________________________
Deleted: svn:keywords
- Author Date Id Revision
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_guard.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_guard.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_guard.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2005 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2005 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
@@ -11,8 +11,6 @@
#
##############################################################################
""" Guard tests.
-
-$Id$
"""
import unittest
@@ -265,6 +263,3 @@
return unittest.TestSuite((
unittest.makeSuite(TestGuard),
))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
Property changes on: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_guard.py
___________________________________________________________________
Deleted: svn:keywords
- Author Date Id Revision
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_roles.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_roles.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_roles.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2004 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2004 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
@@ -11,8 +11,6 @@
#
##############################################################################
""" Unit tests of role-mapping machinery.
-
-$Id$
"""
import unittest
@@ -67,6 +65,3 @@
return unittest.TestSuite((
unittest.makeSuite(RoleMapTests),
))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
Property changes on: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_roles.py
___________________________________________________________________
Deleted: svn:keywords
- Author Date Id Revision
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/utils.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/utils.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/utils.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/version.txt
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/version.txt 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/version.txt 2010-09-17 12:46:31 UTC (rev 116517)
@@ -1 +1 @@
-2.2.0dev
\ No newline at end of file
+2.3.0dev
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/xml/wtcWorkflowExport.xml
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/xml/wtcWorkflowExport.xml 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/xml/wtcWorkflowExport.xml 2010-09-17 12:46:31 UTC (rev 116517)
@@ -13,8 +13,9 @@
description info/description;
manager_bypass info/manager_bypass;
state_variable info/state_variable;
- initial_state info/initial_state">
- <instance-creation-conditions tal:define="creation_guard info/creation_guard" tal:condition="creation_guard">
+ initial_state info/initial_state"
+><tal:case tal:condition="info/creation_guard">
+ <instance-creation-conditions tal:define="creation_guard info/creation_guard">
<guard
><tal:case tal:condition="creation_guard/guard_permissions">
<guard-permission
@@ -33,7 +34,7 @@
tal:content="creation_guard/guard_expr">EXPRESSION</guard-expression
></tal:case>
</guard>
- </instance-creation-conditions>
+ </instance-creation-conditions></tal:case>
<permission
tal:repeat="permission info/permissions"
tal:content="permission">PERMISSION</permission>
Property changes on: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/xml/wtcWorkflowExport.xml
___________________________________________________________________
Deleted: svn:keywords
- Author Date Id Revision
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/setup.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/setup.py 2010-09-17 12:46:19 UTC (rev 116516)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/setup.py 2010-09-17 12:46:31 UTC (rev 116517)
@@ -34,7 +34,7 @@
"Topic :: Software Development :: Libraries :: Application Frameworks",
],
keywords='web application server zope zope2 cmf',
- author="Zope Corporation and contributors",
+ author="Zope Foundation and Contributors",
author_email="zope-cmf at zope.org",
url="http://pypi.python.org/pypi/Products.DCWorkflow",
license="ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)",
@@ -46,7 +46,7 @@
],
install_requires=[
'setuptools',
- 'Zope2 >= 2.12.0b3dev',
+ 'Zope2 >= 2.12.0',
'Products.CMFCore',
'Products.GenericSetup',
],
More information about the checkins
mailing list