Commit 2b9135b2 authored by Tres Seaver's avatar Tres Seaver

Because we require Zope >= 2.10, we don't need a BBB conditional import.

parent d4b6c0ba
...@@ -2,5 +2,6 @@ Products.DCWorkflow Changelog ...@@ -2,5 +2,6 @@ Products.DCWorkflow Changelog
Products.DCWorkflow 2.2.0 (unreleased) Products.DCWorkflow 2.2.0 (unreleased)
- Fixed a deprecation warning for Products.PageTemplates.TALES by a - Fixed an import error (Products.PageTemplates.TALES is gone on
conditional import, so it still works on Zope 2.12. Zope trunk). Because we require Zope >= 2.10, we don't need a
BBB conditional import.
...@@ -27,12 +27,6 @@ from Products.CMFCore.WorkflowTool import WorkflowTool ...@@ -27,12 +27,6 @@ from Products.CMFCore.WorkflowTool import WorkflowTool
from Products.DCWorkflow.Guard import Guard from Products.DCWorkflow.Guard import Guard
from Products.DCWorkflow.DCWorkflow import DCWorkflowDefinition from Products.DCWorkflow.DCWorkflow import DCWorkflowDefinition
# BBB for Zope < 2.10
try:
from zope.tales.tales import CompilerError
except ImportError:
from Products.PageTemplates.TALES import CompilerError
class TestGuard(unittest.TestCase): class TestGuard(unittest.TestCase):
...@@ -50,6 +44,7 @@ class TestGuard(unittest.TestCase): ...@@ -50,6 +44,7 @@ class TestGuard(unittest.TestCase):
return self.site.portal_workflow['wf'] return self.site.portal_workflow['wf']
def test_BaseGuardAPI(self): def test_BaseGuardAPI(self):
from zope.tales.tales import CompilerError
# #
# Test guard basic API # Test guard basic API
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment