[Checkins] SVN: Products.DCWorkflow/trunk/Products/DCWorkflow/ Fixed a deprecation warning for Products.PageTemplates.TALES by a conditional import, so it still works on Zope 2.12.

[Hanno Schlichting]

Log message for revision 85786:
  Fixed a deprecation warning for Products.PageTemplates.TALES by a conditional import, so it still works on Zope 2.12.
  

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 11:17:45 UTC (rev 85785)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/CHANGES.txt	2008-04-27 12:15:46 UTC (rev 85786)
@@ -2,4 +2,5 @@
 
   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.

Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/tests/test_guard.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/tests/test_guard.py	2008-04-27 11:17:45 UTC (rev 85785)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/tests/test_guard.py	2008-04-27 12:15:46 UTC (rev 85786)
@@ -17,11 +17,8 @@
 
 import unittest
 import Testing
-import warnings
 
 from AccessControl import getSecurityManager
-warnings.filterwarnings('ignore', "Products.PageTemplates.TALES has moved")
-from Products.PageTemplates.TALES import CompilerError
 from Products.CMFCore.tests.base.dummy import DummyContent
 from Products.CMFCore.tests.base.dummy import DummySite
 from Products.CMFCore.tests.base.dummy import DummyTool
@@ -30,7 +27,13 @@
 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):