- moved the Zope dependency to version 2.12.0b3dev

- updated some imports
- removed obsolete BBB code

Products/DCWorkflow/CHANGES.txt

@@ -4,6 +4,8 @@ Products.DCWorkflow Changelog
 2.2.0 (unreleased)
 ------------------
 
+- moved the Zope dependency to version 2.12.0b3dev
+
 - Worklists: The catalog variable match setting can now be a 
   formatted string (as before), but also a qualified TAL 
   expression, meaning it has a prefix like "string:", "python:".

Products/DCWorkflow/browser/configure.zcml

@@ -4,7 +4,7 @@
     >
 
   <browser:page
-      for="zope.app.container.interfaces.IAdding"
+      for="zope.browser.interfaces.IAdding"
       name="addDCWorkflowDefinition.html"
       template="addWithPresettings.pt"
       class="Products.DCWorkflow.browser.workflow.DCWorkflowDefinitionAddView"

Products/DCWorkflow/testing.py

@@ -16,12 +16,13 @@ $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
 
 
-class ExportImportZCMLLayer:
+class ExportImportZCMLLayer(ZopeLite):
 
     @classmethod
     def setUp(cls):
@@ -44,13 +45,3 @@ class ExportImportZCMLLayer:
     @classmethod
     def tearDown(cls):
         cleanUp()
-
-
-# Derive from ZopeLite layer if available
-try:
-    from Testing.ZopeTestCase.layer import ZopeLite
-except ImportError:
-    pass # Zope < 2.11
-else:
-    ExportImportZCMLLayer.__bases__ = (ZopeLite,)
-

setup.py

@@ -45,13 +45,14 @@ setup(name='Products.%s' % NAME,
       setup_requires=['eggtestinfo',
                      ],
       install_requires=[
-          #'Zope >= 2.10.4',
           'setuptools',
+          'Zope2 >= 2.12.0b3dev',
           'Products.CMFCore',
           'Products.GenericSetup',
           ],
-      tests_require=['zope.testing>=3.7.0',
-                    ],
+      tests_require=[
+          'zope.testing >= 3.7.0',
+          ],
       test_loader='zope.testing.testrunner.eggsupport:SkipLayers',
       test_suite='Products.%s.tests' % NAME,
       entry_points="""