[Checkins] SVN: Products.CMFCore/trunk/ - require at least Zope 2.13.4
Yvo Schubbe
y.2011 at wcm-solutions.de
Sat Feb 19 05:05:10 EST 2011
Log message for revision 120433:
- require at least Zope 2.13.4
- marked 'setDefaultRoles' as deprecated
Changed:
U Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
UU Products.CMFCore/trunk/Products/CMFCore/FSDTMLMethod.py
U Products.CMFCore/trunk/Products/CMFCore/FSObject.py
UU Products.CMFCore/trunk/Products/CMFCore/PortalObject.py
UU Products.CMFCore/trunk/Products/CMFCore/permissions.py
U Products.CMFCore/trunk/Products/CMFCore/testing.py
U Products.CMFCore/trunk/Products/CMFCore/tests/test_utils.py
U Products.CMFCore/trunk/Products/CMFCore/tests/test_zcml.py
UU Products.CMFCore/trunk/setup.py
-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt 2011-02-19 10:04:01 UTC (rev 120432)
+++ Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt 2011-02-19 10:05:09 UTC (rev 120433)
@@ -4,6 +4,10 @@
2.3.0-alpha (unreleased)
------------------------
+- permissions: Marked 'setDefaultRoles' as deprecated.
+
+- Require at least Zope 2.13.4.
+
- DirectoryView: Added 'bobobase_modification_time' method to FSObject.
The "Contents" tab in the ZMI now shows useful 'Last Modified' values.
@@ -41,8 +45,6 @@
- testing: Removed broken run function.
Unit test modules are no longer directly executable.
-- Require at least Zope 2.12.11.
-
- DateTime 2.12.5 does away with a special case representing
DateTime values for midnight (00:00:00) without their time and
time zone values. So DateTimes formerly rendered as
Modified: Products.CMFCore/trunk/Products/CMFCore/FSDTMLMethod.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSDTMLMethod.py 2011-02-19 10:04:01 UTC (rev 120432)
+++ Products.CMFCore/trunk/Products/CMFCore/FSDTMLMethod.py 2011-02-19 10:05:09 UTC (rev 120433)
@@ -11,22 +11,16 @@
#
##############################################################################
""" Customizable DTML methods that come from the filesystem.
-
-$Id$
"""
-try:
- from OFS.role import RoleManager
-except ImportError:
- # BBB for Zope < 2.13
- from AccessControl.Role import RoleManager
-
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.SecurityManagement import getSecurityManager
from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from App.special_dtml import HTML
+from DocumentTemplate.security import RestrictedDTML
from OFS.DTMLMethod import DTMLMethod, decapitate, guess_content_type
+from OFS.role import RoleManager
from Products.CMFCore.DirectoryView import registerFileExtension
from Products.CMFCore.DirectoryView import registerMetaType
@@ -38,12 +32,6 @@
from Products.CMFCore.utils import _dtmldir
from Products.CMFCore.utils import _setCacheHeaders
-# BBB for Zope 2.12
-try:
- from DocumentTemplate.security import RestrictedDTML
-except ImportError:
- from AccessControl.DTML import RestrictedDTML
-
_marker = object()
Property changes on: Products.CMFCore/trunk/Products/CMFCore/FSDTMLMethod.py
___________________________________________________________________
Deleted: svn:keywords
- Author Date Id Revision
Modified: Products.CMFCore/trunk/Products/CMFCore/FSObject.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSObject.py 2011-02-19 10:04:01 UTC (rev 120432)
+++ Products.CMFCore/trunk/Products/CMFCore/FSObject.py 2011-02-19 10:05:09 UTC (rev 120433)
@@ -16,11 +16,6 @@
import os
from AccessControl.Permission import Permission
-try:
- from OFS.role import RoleManager
-except ImportError:
- # BBB for Zope < 2.13
- from AccessControl.Role import RoleManager
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
from Acquisition import aq_inner
@@ -31,6 +26,7 @@
from App.special_dtml import HTML
from DateTime.DateTime import DateTime
from OFS.Cache import Cacheable
+from OFS.role import RoleManager
from OFS.SimpleItem import Item
from Products.PythonScripts.standard import html_quote
Modified: Products.CMFCore/trunk/Products/CMFCore/PortalObject.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/PortalObject.py 2011-02-19 10:04:01 UTC (rev 120432)
+++ Products.CMFCore/trunk/Products/CMFCore/PortalObject.py 2011-02-19 10:05:09 UTC (rev 120433)
@@ -11,8 +11,6 @@
#
##############################################################################
""" PortalObject: The portal root object class
-
-$Id$
"""
from App.class_init import InitializeClass
@@ -21,19 +19,15 @@
from zope.component.interfaces import ComponentLookupError
from zope.event import notify
from zope.interface import implements
-try:
- from zope.traversing.interfaces import BeforeTraverseEvent
-except ImportError:
- # BBB: for Zope < 2.13
- from zope.app.publication.zopepublication import BeforeTraverseEvent
+from zope.traversing.interfaces import BeforeTraverseEvent
from Products.CMFCore.interfaces import ISiteRoot
from Products.CMFCore.permissions import AddPortalMember
-from Products.CMFCore.permissions import SetOwnPassword
-from Products.CMFCore.permissions import SetOwnProperties
from Products.CMFCore.permissions import MailForgottenPassword
from Products.CMFCore.permissions import RequestReview
from Products.CMFCore.permissions import ReviewPortalContent
+from Products.CMFCore.permissions import SetOwnPassword
+from Products.CMFCore.permissions import SetOwnProperties
from Products.CMFCore.PortalFolder import PortalFolder
from Products.CMFCore.Skinnable import SkinnableObjectManager
Property changes on: Products.CMFCore/trunk/Products/CMFCore/PortalObject.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFCore/trunk/Products/CMFCore/permissions.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/permissions.py 2011-02-19 10:04:01 UTC (rev 120432)
+++ Products.CMFCore/trunk/Products/CMFCore/permissions.py 2011-02-19 10:05:09 UTC (rev 120433)
@@ -11,16 +11,15 @@
#
##############################################################################
""" CMFCore product permissions.
-
-$Id$
"""
from AccessControl import Permissions
-from AccessControl.Permission import _registeredPermissions
-from AccessControl.Permission import ApplicationDefaultPermissions
-from AccessControl.Permission import pname
+from AccessControl.Permission import addPermission
from AccessControl.SecurityInfo import ModuleSecurityInfo
+from zope.deferredimport import deprecated
+deprecated("Please use addPermission from AccessControl.Permission.",
+ setDefaultRoles='AccessControl.Permission:addPermission')
security = ModuleSecurityInfo('Products.CMFCore.permissions')
@@ -55,32 +54,9 @@
security.declarePublic('ViewManagementScreens')
ViewManagementScreens = Permissions.view_management_screens
-addPermission = None
-try:
- from AccessControl.Permission import addPermission
-except ImportError:
- pass
-security.declarePrivate('setDefaultRoles')
-def setDefaultRoles(permission, roles):
- '''
- Sets the defaults roles for a permission.
- '''
- if addPermission is not None:
- addPermission(permission, roles)
- else:
- # BBB This is in AccessControl starting in Zope 2.13
- import Products
- registered = _registeredPermissions
- if not registered.has_key(permission):
- registered[permission] = 1
- Products.__ac_permissions__=(
- Products.__ac_permissions__+((permission,(),roles),))
- mangled = pname(permission)
- setattr(ApplicationDefaultPermissions, mangled, roles)
-
# Note that we can only use the default Zope roles in calls to
-# setDefaultRoles(). The default Zope roles are:
+# addPermission(). The default Zope roles are:
# Anonymous, Manager, and Owner.
#
@@ -89,63 +65,63 @@
security.declarePublic('ListFolderContents')
ListFolderContents = 'List folder contents'
-setDefaultRoles( ListFolderContents, ( 'Manager', 'Owner' ) )
+addPermission(ListFolderContents, ('Manager', 'Owner'))
security.declarePublic('ListUndoableChanges')
ListUndoableChanges = 'List undoable changes'
-setDefaultRoles( ListUndoableChanges, ('Manager',) ) # + Member
+addPermission(ListUndoableChanges, ('Manager',)) # + Member
security.declarePublic('AccessInactivePortalContent')
AccessInactivePortalContent = 'Access inactive portal content'
-setDefaultRoles(AccessInactivePortalContent, ('Manager',))
+addPermission(AccessInactivePortalContent, ('Manager',))
security.declarePublic('ModifyCookieCrumblers')
ModifyCookieCrumblers = 'Modify Cookie Crumblers'
-setDefaultRoles(ModifyCookieCrumblers, ('Manager',))
+addPermission(ModifyCookieCrumblers, ('Manager',))
security.declarePublic('ReplyToItem')
ReplyToItem = 'Reply to item'
-setDefaultRoles(ReplyToItem, ('Manager',)) # + Member
+addPermission(ReplyToItem, ('Manager',)) # + Member
security.declarePublic('ManagePortal')
ManagePortal = 'Manage portal'
-setDefaultRoles(ManagePortal, ('Manager',))
+addPermission(ManagePortal, ('Manager',))
security.declarePublic('ModifyPortalContent')
ModifyPortalContent = 'Modify portal content'
-setDefaultRoles(ModifyPortalContent, ('Manager',))
+addPermission(ModifyPortalContent, ('Manager',))
security.declarePublic('ListPortalMembers')
ListPortalMembers = 'List portal members'
-setDefaultRoles( ListPortalMembers, ('Manager',) ) # + Member
+addPermission(ListPortalMembers, ('Manager',)) # + Member
security.declarePublic('AddPortalFolders')
AddPortalFolders = 'Add portal folders'
-setDefaultRoles(AddPortalFolders, ('Owner','Manager')) # + Member
+addPermission(AddPortalFolders, ('Owner', 'Manager')) # + Member
security.declarePublic('AddPortalContent')
AddPortalContent = 'Add portal content'
-setDefaultRoles(AddPortalContent, ('Owner','Manager',)) # + Member
+addPermission(AddPortalContent, ('Owner', 'Manager',)) # + Member
security.declarePublic('AddPortalMember')
AddPortalMember = 'Add portal member'
-setDefaultRoles(AddPortalMember, ('Anonymous', 'Manager',))
+addPermission(AddPortalMember, ('Anonymous', 'Manager',))
security.declarePublic('SetOwnPassword')
SetOwnPassword = 'Set own password'
-setDefaultRoles(SetOwnPassword, ('Manager',)) # + Member
+addPermission(SetOwnPassword, ('Manager',)) # + Member
security.declarePublic('SetOwnProperties')
SetOwnProperties = 'Set own properties'
-setDefaultRoles(SetOwnProperties, ('Manager',)) # + Member
+addPermission(SetOwnProperties, ('Manager',)) # + Member
security.declarePublic('ChangeLocalRoles')
ChangeLocalRoles = 'Change local roles'
-setDefaultRoles(ChangeLocalRoles, ('Owner', 'Manager'))
+addPermission(ChangeLocalRoles, ('Owner', 'Manager'))
security.declarePublic('MailForgottenPassword')
MailForgottenPassword = 'Mail forgotten password'
-setDefaultRoles(MailForgottenPassword, ('Anonymous', 'Manager',))
+addPermission(MailForgottenPassword, ('Anonymous', 'Manager',))
#
@@ -154,9 +130,8 @@
security.declarePublic('RequestReview')
RequestReview = 'Request review'
-setDefaultRoles(RequestReview, ('Owner', 'Manager',))
+addPermission(RequestReview, ('Owner', 'Manager',))
security.declarePublic('ReviewPortalContent')
ReviewPortalContent = 'Review portal content'
-setDefaultRoles(ReviewPortalContent, ('Manager',)) # + Reviewer
-
+addPermission(ReviewPortalContent, ('Manager',)) # + Reviewer
Property changes on: Products.CMFCore/trunk/Products/CMFCore/permissions.py
___________________________________________________________________
Deleted: svn:keywords
- Author Date Id Revision
Modified: Products.CMFCore/trunk/Products/CMFCore/testing.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/testing.py 2011-02-19 10:04:01 UTC (rev 120432)
+++ Products.CMFCore/trunk/Products/CMFCore/testing.py 2011-02-19 10:05:09 UTC (rev 120433)
@@ -22,17 +22,12 @@
from zope.publisher.interfaces.http import IHTTPRequest
from zope.site.hooks import setHooks
from zope.testing.cleanup import cleanUp
+from Zope2.App import zcml
from Products.CMFCore.interfaces import IWorkflowDefinition
from Products.GenericSetup.utils import BodyAdapterBase
-# BBB for Zope 2.12
-try:
- from Zope2.App import zcml
-except ImportError:
- from Products.Five import zcml
-
class ConformsToFolder:
def test_folder_interfaces(self):
@@ -101,10 +96,7 @@
import Products
zcml.load_config('meta.zcml', Products.Five)
- try:
- zcml.load_config('event.zcml', OFS)
- except IOError: # Zope <= 2.12.x
- zcml.load_config('event.zcml', Products.Five)
+ zcml.load_config('event.zcml', OFS)
zcml.load_config('event.zcml', Products.CMFCore)
setHooks()
@@ -140,8 +132,6 @@
zcml.load_config('configure.zcml', zope.traversing)
zcml.load_config('event.zcml', Products.Five)
zcml.load_config('event.zcml', Products.CMFCore)
- # BBB Next line needed for Zope 2.12:
- zcml.load_config('permissions.zcml', Products.Five)
zcml.load_config('tool.zcml', Products.CMFCore)
setHooks()
@@ -216,20 +206,10 @@
import Products.CMFCore
import Products.CMFCore.exportimport
- try:
- zcml.load_config('meta.zcml', Zope2.App)
- except IOError: # Zope <= 2.12.x
- pass
-
+ zcml.load_config('meta.zcml', Zope2.App)
zcml.load_config('meta.zcml', Products.Five)
-
- try:
- zcml.load_config('permissions.zcml', AccessControl)
- except IOError: # Zope <= 2.12.x
- pass
-
+ zcml.load_config('permissions.zcml', AccessControl)
zcml.load_config('permissions.zcml', Products.Five)
-
zcml.load_config('meta.zcml', Products.GenericSetup)
zcml.load_config('configure.zcml', Products.GenericSetup)
zcml.load_config('permissions.zcml', Products.CMFCore)
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_utils.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_utils.py 2011-02-19 10:04:01 UTC (rev 120432)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_utils.py 2011-02-19 10:05:09 UTC (rev 120433)
@@ -97,11 +97,7 @@
class CoreUtilsSecurityTests(SecurityTest):
def _makeSite(self):
- try:
- from OFS.owner import Owned
- except ImportError:
- # BBB: for Zope < 2.13
- from AccessControl.Owned import Owned
+ from OFS.owner import Owned
from Products.CMFCore.tests.base.dummy import DummySite
from Products.CMFCore.tests.base.dummy import DummyUserFolder
from Products.CMFCore.tests.base.dummy import DummyObject
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_zcml.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_zcml.py 2011-02-19 10:04:01 UTC (rev 120432)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_zcml.py 2011-02-19 10:05:09 UTC (rev 120433)
@@ -22,12 +22,7 @@
Use the cmf:registerDirectory directive::
>>> import Products.CMFCore
- >>> # BBB for Zope 2.12
- ... try:
- ... from Zope2.App import zcml
- ... except ImportError:
- ... from Products.Five import zcml
-
+ >>> from Zope2.App import zcml
>>> configure_zcml = '''
... <configure xmlns:cmf="http://namespaces.zope.org/cmf">
... <cmf:registerDirectory
Modified: Products.CMFCore/trunk/setup.py
===================================================================
--- Products.CMFCore/trunk/setup.py 2011-02-19 10:04:01 UTC (rev 120432)
+++ Products.CMFCore/trunk/setup.py 2011-02-19 10:05:09 UTC (rev 120433)
@@ -46,21 +46,21 @@
],
install_requires=[
'setuptools',
- 'Zope2 >= 2.12.11',
+ 'Zope2 >= 2.13.4',
'five.localsitemanager',
-# 'Products.BTreeFolder2', # BBB: disabled for Zope 2.12
+ 'Products.BTreeFolder2',
'Products.GenericSetup',
-# 'Products.MailHost', # BBB: disabled for Zope 2.12
-# 'Products.PythonScripts', # BBB: disabled for Zope 2.12
+ 'Products.MailHost',
+ 'Products.PythonScripts',
'Products.ZSQLMethods',
],
tests_require=[
'zope.testing >= 3.7.0',
-# 'Products.StandardCacheManagers', # BBB: disabled for Zope 2.12
+ 'Products.StandardCacheManagers',
],
extras_require=dict(
test=[
-# 'Products.StandardCacheManagers', # BBB: disabled for Zope 2.12
+ 'Products.StandardCacheManagers',
]),
test_loader='zope.testing.testrunner.eggsupport:SkipLayers',
test_suite='Products.%s' % NAME,
Property changes on: Products.CMFCore/trunk/setup.py
___________________________________________________________________
Deleted: svn:keywords
- Id
More information about the checkins
mailing list