[Checkins] SVN: Products.CMFTopic/trunk/Products/CMFTopic/ Deal with deprecation warnings for Zope 2.13.

[Hanno Schlichting]

Log message for revision 113184:
  Deal with deprecation warnings for Zope 2.13.
  

Changed:
  U   Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt
  U   Products.CMFTopic/trunk/Products/CMFTopic/testing.py

-=-
Modified: Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt	2010-06-06 13:18:00 UTC (rev 113183)
+++ Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt	2010-06-06 13:20:08 UTC (rev 113184)
@@ -4,7 +4,9 @@
 2.3.0-alpha (unreleased)
 ------------------------
 
+- Deal with deprecation warnings for Zope 2.13.
 
+
 2.2.0-beta (2009-12-06)
 -----------------------
 

Modified: Products.CMFTopic/trunk/Products/CMFTopic/testing.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/testing.py	2010-06-06 13:18:00 UTC (rev 113183)
+++ Products.CMFTopic/trunk/Products/CMFTopic/testing.py	2010-06-06 13:20:08 UTC (rev 113184)
@@ -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