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

Hanno Schlichting hannosch at hannosch.eu
Sun Jun 6 09:18:01 EDT 2010


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

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

-=-
Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt	2010-06-06 13:14:45 UTC (rev 113182)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt	2010-06-06 13:18:00 UTC (rev 113183)
@@ -4,8 +4,11 @@
 2.3.0-alpha (unreleased)
 ------------------------
 
+- Deal with deprecation warnings for Zope 2.13.
+
 - Fixed ViewPageTemplateFile import to use the correct version from Five.
 
+
 2.2.0-beta (2009-12-06)
 -----------------------
 

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.txt
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.txt	2010-06-06 13:14:45 UTC (rev 113182)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.txt	2010-06-06 13:18:00 UTC (rev 113183)
@@ -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/trunk/Products/CMFCalendar/testing.py
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/testing.py	2010-06-06 13:14:45 UTC (rev 113182)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/testing.py	2010-06-06 13:18:00 UTC (rev 113183)
@@ -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



More information about the checkins mailing list