[Checkins] SVN: Products.DCWorkflow/branches/2.2/Products/DCWorkflow/ Backport c113186 from trunk

Hanno Schlichting hannosch at hannosch.eu
Sun Jun 6 09:42:47 EDT 2010


Log message for revision 113194:
  Backport c113186 from trunk
  

Changed:
  U   Products.DCWorkflow/branches/2.2/Products/DCWorkflow/CHANGES.txt
  U   Products.DCWorkflow/branches/2.2/Products/DCWorkflow/testing.py

-=-
Modified: Products.DCWorkflow/branches/2.2/Products/DCWorkflow/CHANGES.txt
===================================================================
--- Products.DCWorkflow/branches/2.2/Products/DCWorkflow/CHANGES.txt	2010-06-06 13:41:44 UTC (rev 113193)
+++ Products.DCWorkflow/branches/2.2/Products/DCWorkflow/CHANGES.txt	2010-06-06 13:42:47 UTC (rev 113194)
@@ -4,7 +4,9 @@
 2.2.1-beta (unreleased)
 -----------------------
 
+- Deal with deprecation warnings for Zope 2.13.
 
+
 2.2.0 (2010-01-04)
 ------------------
 

Modified: Products.DCWorkflow/branches/2.2/Products/DCWorkflow/testing.py
===================================================================
--- Products.DCWorkflow/branches/2.2/Products/DCWorkflow/testing.py	2010-06-06 13:41:44 UTC (rev 113193)
+++ Products.DCWorkflow/branches/2.2/Products/DCWorkflow/testing.py	2010-06-06 13:42:47 UTC (rev 113194)
@@ -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



More information about the checkins mailing list