[Checkins] SVN: Products.CMFTopic/branches/2.2/Products/CMFTopic/ Backport c113184 from trunk

[Hanno Schlichting]

Log message for revision 113193:
  Backport c113184 from trunk
  

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

-=-
Modified: Products.CMFTopic/branches/2.2/Products/CMFTopic/CHANGES.txt
===================================================================
--- Products.CMFTopic/branches/2.2/Products/CMFTopic/CHANGES.txt	2010-06-06 13:40:29 UTC (rev 113192)
+++ Products.CMFTopic/branches/2.2/Products/CMFTopic/CHANGES.txt	2010-06-06 13:41:44 UTC (rev 113193)
@@ -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.CMFTopic/branches/2.2/Products/CMFTopic/testing.py
===================================================================
--- Products.CMFTopic/branches/2.2/Products/CMFTopic/testing.py	2010-06-06 13:40:29 UTC (rev 113192)
+++ Products.CMFTopic/branches/2.2/Products/CMFTopic/testing.py	2010-06-06 13:41:44 UTC (rev 113193)
@@ -20,12 +20,17 @@
 ZopeTestCase.installProduct('CMFCore', 1)
 
 import transaction
-from Products.Five import zcml
 
 from Products.CMFCore.testing import FunctionalZCMLLayer
 from Products.CMFDefault.factory import addConfiguredSite
 
+# BBB for Zope 2.12
+try:
+    from Zope2.App import zcml
+except ImportError:
+    from Products.Five import zcml
 
+
 class FunctionalLayer(FunctionalZCMLLayer):
 
     @classmethod