[Checkins] SVN: Products.DCWorkflow/trunk/Products/DCWorkflow/ Because we require Zope >= 2.10, we don't need a BBB conditional import.

[Tres Seaver]

Log message for revision 85787:
  Because we require Zope >= 2.10, we don't need a BBB conditional import.
  

Changed:
  U   Products.DCWorkflow/trunk/Products/DCWorkflow/CHANGES.txt
  U   Products.DCWorkflow/trunk/Products/DCWorkflow/tests/test_guard.py

-=-
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/CHANGES.txt
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/CHANGES.txt	2008-04-27 12:15:46 UTC (rev 85786)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/CHANGES.txt	2008-04-27 12:29:56 UTC (rev 85787)
@@ -2,5 +2,6 @@
 
   Products.DCWorkflow 2.2.0 (unreleased)
 
-    - Fixed a deprecation warning for Products.PageTemplates.TALES by a
-      conditional import, so it still works on Zope 2.12.
+    - Fixed an import error (Products.PageTemplates.TALES is gone on 
+      Zope trunk).  Because we require Zope >= 2.10, we don't need a
+      BBB conditional import.

Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/tests/test_guard.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/tests/test_guard.py	2008-04-27 12:15:46 UTC (rev 85786)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/tests/test_guard.py	2008-04-27 12:29:56 UTC (rev 85787)
@@ -27,13 +27,7 @@
 from Products.DCWorkflow.Guard import Guard
 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):
 
     def setUp(self):
@@ -50,6 +44,7 @@
         return self.site.portal_workflow['wf']
 
     def test_BaseGuardAPI(self):
+        from zope.tales.tales import CompilerError
 
         #
         # Test guard basic API