[Checkins] SVN: Products.CMFTopic/trunk/ - require at least Zope 2.13.4
Yvo Schubbe
y.2011 at wcm-solutions.de
Sat Feb 19 05:06:24 EST 2011
Log message for revision 120435:
- require at least Zope 2.13.4
Changed:
U Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt
UU Products.CMFTopic/trunk/Products/CMFTopic/permissions.py
UU Products.CMFTopic/trunk/Products/CMFTopic/testing.py
U Products.CMFTopic/trunk/setup.py
-=-
Modified: Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt 2011-02-19 10:05:57 UTC (rev 120434)
+++ Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt 2011-02-19 10:06:24 UTC (rev 120435)
@@ -4,6 +4,8 @@
2.3.0-alpha (unreleased)
------------------------
+- Require at least Zope 2.13.4.
+
- Deal with deprecation warnings for Zope 2.13.
Modified: Products.CMFTopic/trunk/Products/CMFTopic/permissions.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/permissions.py 2011-02-19 10:05:57 UTC (rev 120434)
+++ Products.CMFTopic/trunk/Products/CMFTopic/permissions.py 2011-02-19 10:06:24 UTC (rev 120435)
@@ -11,22 +11,20 @@
#
##############################################################################
""" Permissions used throughout CMFTopic.
-
-$Id$
"""
+
from AccessControl import ModuleSecurityInfo
+from AccessControl.Permission import addPermission
security = ModuleSecurityInfo('Products.CMFTopic.permissions')
-from Products.CMFCore.permissions import setDefaultRoles
-
security.declarePublic('AddTopics')
AddTopics = 'Add portal topics'
-setDefaultRoles(AddTopics, ('Manager',))
+addPermission(AddTopics, ('Manager',))
security.declarePublic('ChangeTopics')
ChangeTopics = 'Change portal topics'
-setDefaultRoles(ChangeTopics, ('Manager', 'Owner',))
+addPermission(ChangeTopics, ('Manager', 'Owner',))
security.declarePublic('AccessContentsInformation')
from Products.CMFCore.permissions import AccessContentsInformation
Property changes on: Products.CMFTopic/trunk/Products/CMFTopic/permissions.py
___________________________________________________________________
Deleted: svn:keywords
- Author Date Id Revision
Modified: Products.CMFTopic/trunk/Products/CMFTopic/testing.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/testing.py 2011-02-19 10:05:57 UTC (rev 120434)
+++ Products.CMFTopic/trunk/Products/CMFTopic/testing.py 2011-02-19 10:06:24 UTC (rev 120435)
@@ -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
@@ -56,4 +49,3 @@
app._delObject('site')
transaction.commit()
ZopeTestCase.close(app)
-
Property changes on: Products.CMFTopic/trunk/Products/CMFTopic/testing.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFTopic/trunk/setup.py
===================================================================
--- Products.CMFTopic/trunk/setup.py 2011-02-19 10:05:57 UTC (rev 120434)
+++ Products.CMFTopic/trunk/setup.py 2011-02-19 10:06:24 UTC (rev 120435)
@@ -46,7 +46,7 @@
],
install_requires=[
'setuptools',
- 'Zope2 >= 2.12.0',
+ 'Zope2 >= 2.13.4',
'Products.CMFCore',
'Products.CMFDefault',
'Products.GenericSetup',
More information about the checkins
mailing list