[Checkins] SVN: Products.CMFCalendar/trunk/ - require at least Zope 2.13.4

[Yvo Schubbe]

Log message for revision 120432:
  - require at least Zope 2.13.4

Changed:
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.txt
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/browser/tests.py
  UU  Products.CMFCalendar/trunk/Products/CMFCalendar/permissions.py
  UU  Products.CMFCalendar/trunk/Products/CMFCalendar/testing.py
  U   Products.CMFCalendar/trunk/setup.py

-=-
Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt	2011-02-19 09:56:55 UTC (rev 120431)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt	2011-02-19 10:04:01 UTC (rev 120432)
@@ -4,6 +4,8 @@
 2.3.0-alpha (unreleased)
 ------------------------
 
+- Require at least Zope 2.13.4.
+
 - Deal with deprecation warnings for Zope 2.13.
 
 - Fixed ViewPageTemplateFile import to use the correct version from Five.

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.txt
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.txt	2011-02-19 09:56:55 UTC (rev 120431)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.txt	2011-02-19 10:04:01 UTC (rev 120432)
@@ -13,12 +13,7 @@
 
 Create the browser object we'll be using.
 
-    # BBB for Zope 2.12
-    >>> try:
-    ...     from Testing.testbrowser import Browser
-    ... except ImportError:
-    ...     from Products.Five.testbrowser import Browser
-
+    >>> from Testing.testbrowser import Browser
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/browser/tests.py
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/browser/tests.py	2011-02-19 09:56:55 UTC (rev 120431)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/browser/tests.py	2011-02-19 10:04:01 UTC (rev 120432)
@@ -15,11 +15,9 @@
 
 import unittest
 from Testing import ZopeTestCase
-try:
-    from Zope2.App.schema import Zope2VocabularyRegistry
-except ImportError:  # Zope2 <= 2.12
-    from Products.Five.schema import Zope2VocabularyRegistry
 
+from Zope2.App.schema import Zope2VocabularyRegistry
+
 from Products.CMFCalendar.testing import FunctionalLayer
 
 def _setupVocabulary(ztc):

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/permissions.py
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/permissions.py	2011-02-19 09:56:55 UTC (rev 120431)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/permissions.py	2011-02-19 10:04:01 UTC (rev 120432)
@@ -11,22 +11,20 @@
 #
 ##############################################################################
 """ CMFCalendar product permissions
-
-$Id$
 """
+
 from AccessControl import ModuleSecurityInfo
+from AccessControl.Permission import addPermission
 
-from Products.CMFCore.permissions import setDefaultRoles
-
 security = ModuleSecurityInfo('Products.CMFCalendar.permissions')
 
 security.declarePublic('AddEvents')
 AddEvents = 'Add portal events'
-setDefaultRoles(AddEvents, ('Manager', 'Owner', 'Member'))
+addPermission(AddEvents, ('Manager', 'Owner', 'Member'))
 
 security.declarePublic('ChangeEvents')
 ChangeEvents = 'Change portal events'
-setDefaultRoles(ChangeEvents, ('Manager', 'Owner',))
+addPermission(ChangeEvents, ('Manager', 'Owner',))
 
 security.declarePublic('AddPortalContent')
 from Products.CMFCore.permissions import AddPortalContent


Property changes on: Products.CMFCalendar/trunk/Products/CMFCalendar/permissions.py
___________________________________________________________________
Deleted: svn:keywords
   - Author Date Id Revision

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/testing.py
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/testing.py	2011-02-19 09:56:55 UTC (rev 120431)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/testing.py	2011-02-19 10:04:01 UTC (rev 120432)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """ Unit test layers.
-
-$Id$
 """
 
 from Testing import ZopeTestCase
@@ -20,17 +18,12 @@
 ZopeTestCase.installProduct('CMFCore', 1)
 
 import transaction
+from Zope2.App 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
@@ -57,4 +50,3 @@
         app._delObject('site')
         transaction.commit()
         ZopeTestCase.close(app)
-


Property changes on: Products.CMFCalendar/trunk/Products/CMFCalendar/testing.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.CMFCalendar/trunk/setup.py
===================================================================
--- Products.CMFCalendar/trunk/setup.py	2011-02-19 09:56:55 UTC (rev 120431)
+++ Products.CMFCalendar/trunk/setup.py	2011-02-19 10:04:01 UTC (rev 120432)
@@ -46,7 +46,7 @@
                      ],
       install_requires=[
           'setuptools',
-          'Zope2 >= 2.12.0',
+          'Zope2 >= 2.13.4',
           'Products.CMFCore',
           'Products.CMFDefault',
           'Products.GenericSetup',