[Checkins] SVN: Products.CMFCalendar/branches/2.2/Products/CMFCalendar/ Backport c113183 from trunk

[Hanno Schlichting]

Log message for revision 113192:
  Backport c113183 from trunk
  

Changed:
  U   Products.CMFCalendar/branches/2.2/Products/CMFCalendar/CHANGES.txt
  U   Products.CMFCalendar/branches/2.2/Products/CMFCalendar/browser/event.txt
  U   Products.CMFCalendar/branches/2.2/Products/CMFCalendar/testing.py

-=-
Modified: Products.CMFCalendar/branches/2.2/Products/CMFCalendar/CHANGES.txt
===================================================================
--- Products.CMFCalendar/branches/2.2/Products/CMFCalendar/CHANGES.txt	2010-06-06 13:35:06 UTC (rev 113191)
+++ Products.CMFCalendar/branches/2.2/Products/CMFCalendar/CHANGES.txt	2010-06-06 13:40:29 UTC (rev 113192)
@@ -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.CMFCalendar/branches/2.2/Products/CMFCalendar/browser/event.txt
===================================================================
--- Products.CMFCalendar/branches/2.2/Products/CMFCalendar/browser/event.txt	2010-06-06 13:35:06 UTC (rev 113191)
+++ Products.CMFCalendar/branches/2.2/Products/CMFCalendar/browser/event.txt	2010-06-06 13:40:29 UTC (rev 113192)
@@ -13,7 +13,12 @@
 
 Create the browser object we'll be using.
 
-    >>> from Products.Five.testbrowser import Browser
+    # BBB for Zope 2.12
+    >>> try:
+    ...     from Testing.testbrowser import Browser
+    ... except ImportError:
+    ...     from Products.Five.testbrowser import Browser
+
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')

Modified: Products.CMFCalendar/branches/2.2/Products/CMFCalendar/testing.py
===================================================================
--- Products.CMFCalendar/branches/2.2/Products/CMFCalendar/testing.py	2010-06-06 13:35:06 UTC (rev 113191)
+++ Products.CMFCalendar/branches/2.2/Products/CMFCalendar/testing.py	2010-06-06 13:40:29 UTC (rev 113192)
@@ -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