[Checkins] SVN: zope.securitypolicy/trunk/ Drop support for Python 2.4 and 2.5.
Tres Seaver
cvs-admin at zope.org
Fri May 18 15:57:38 UTC 2012
Log message for revision 126152:
Drop support for Python 2.4 and 2.5.
Replace deprecated 'zope.interface.classProvides' usage with equivalent
'zope.interface.provider' decorator.
Replace deprecated 'zope.interface.implements' usage with equivalent
'zope.interface.implementer' decorator.
Changed:
U zope.securitypolicy/trunk/CHANGES.txt
U zope.securitypolicy/trunk/setup.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/grantinfo.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/principalpermission.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/principalrole.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/role.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/rolepermission.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/__init__.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalrolemanager.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationrolepermissionmanager.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/vocabulary.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.txt
-=-
Modified: zope.securitypolicy/trunk/CHANGES.txt
===================================================================
--- zope.securitypolicy/trunk/CHANGES.txt 2012-05-18 15:49:38 UTC (rev 126151)
+++ zope.securitypolicy/trunk/CHANGES.txt 2012-05-18 15:57:35 UTC (rev 126152)
@@ -2,12 +2,18 @@
CHANGES
=======
-3.7.1 (unreleased)
+4.0.0 (unreleased)
------------------
-- Nothing changed yet.
+- Replaced deprecated ``zope.interface.classProvides`` usage with equivalent
+ ``zope.interface.provider`` decorator.
+- Replaced deprecated ``zope.interface.implements`` usage with equivalent
+ ``zope.interface.implementer`` decorator.
+- Dropped support for Python 2.4 and 2.5.
+
+
3.7.0 (2010-09-25)
------------------
Modified: zope.securitypolicy/trunk/setup.py
===================================================================
--- zope.securitypolicy/trunk/setup.py 2012-05-18 15:49:38 UTC (rev 126151)
+++ zope.securitypolicy/trunk/setup.py 2012-05-18 15:57:35 UTC (rev 126152)
@@ -28,7 +28,7 @@
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
setup(name='zope.securitypolicy',
- version='3.7.1dev',
+ version='4.0.0dev',
author='Zope Foundation and Contributors',
author_email='zope-dev at zope.org',
description='Default security policy for Zope3',
@@ -45,6 +45,9 @@
'Intended Audience :: Developers',
'License :: OSI Approved :: Zope Public License',
'Programming Language :: Python',
+ 'Programming Language :: Python :: 2',
+ 'Programming Language :: Python :: 2.6',
+ 'Programming Language :: Python :: 2.7',
'Natural Language :: English',
'Operating System :: OS Independent',
'Topic :: Internet :: WWW/HTTP',
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/grantinfo.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/grantinfo.py 2012-05-18 15:49:38 UTC (rev 126151)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/grantinfo.py 2012-05-18 15:57:35 UTC (rev 126152)
@@ -14,7 +14,7 @@
"""Grant info
"""
from zope.annotation.interfaces import IAnnotations
-from zope.interface import implements
+from zope.interface import implementer
from zope.securitypolicy.interfaces import Unset
from zope.securitypolicy.interfaces import IGrantInfo
@@ -34,10 +34,9 @@
del AnnotationRolePermissionManager
+ at implementer(IGrantInfo)
class AnnotationGrantInfo(object):
- implements(IGrantInfo)
-
prinper = prinrole = permrole = {}
def __init__(self, context):
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/principalpermission.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/principalpermission.py 2012-05-18 15:49:38 UTC (rev 126151)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/principalpermission.py 2012-05-18 15:57:35 UTC (rev 126152)
@@ -14,7 +14,7 @@
"""Mappings between principals and permissions, stored in an object locally.
"""
-from zope.interface import implements
+from zope.interface import implementer
from zope.security.permission import allPermissions
from zope.authentication.principal import checkPrincipal
@@ -24,6 +24,7 @@
from zope.securitypolicy.securitymap import AnnotationSecurityMap
+ at implementer(IPrincipalPermissionManager)
class AnnotationPrincipalPermissionManager(AnnotationSecurityMap):
"""Mappings between principals and permissions."""
@@ -33,8 +34,6 @@
# we'll keep it as is, to prevent breaking old data:
key = 'zopel.app.security.AnnotationPrincipalPermissionManager'
- implements(IPrincipalPermissionManager)
-
def grantPermissionToPrincipal(self, permission_id, principal_id):
AnnotationSecurityMap.addCell(self, permission_id, principal_id, Allow)
@@ -52,11 +51,10 @@
getPrincipalsAndPermissions = AnnotationSecurityMap.getAllCells
+ at implementer(IPrincipalPermissionManager)
class PrincipalPermissionManager(SecurityMap):
"""Mappings between principals and permissions."""
- implements(IPrincipalPermissionManager)
-
def grantPermissionToPrincipal(self, permission_id, principal_id,
check=True):
''' See the interface IPrincipalPermissionManager '''
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/principalrole.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/principalrole.py 2012-05-18 15:49:38 UTC (rev 126151)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/principalrole.py 2012-05-18 15:57:35 UTC (rev 126152)
@@ -13,7 +13,7 @@
##############################################################################
"""Mappings between principals and roles, stored in an object locally.
"""
-from zope.interface import implements
+from zope.interface import implementer
from zope.authentication.principal import checkPrincipal
from zope.securitypolicy.interfaces import Allow, Deny, Unset
@@ -23,6 +23,7 @@
from zope.securitypolicy.role import checkRole
+ at implementer(IPrincipalRoleManager)
class AnnotationPrincipalRoleManager(AnnotationSecurityMap):
"""Mappings between principals and roles."""
@@ -30,8 +31,6 @@
# location, but cannot change without breaking existing databases
key = 'zope.app.security.AnnotationPrincipalRoleManager'
- implements(IPrincipalRoleManager)
-
def assignRoleToPrincipal(self, role_id, principal_id):
AnnotationSecurityMap.addCell(self, role_id, principal_id, Allow)
@@ -49,11 +48,10 @@
getPrincipalsAndRoles = AnnotationSecurityMap.getAllCells
+ at implementer(IPrincipalRoleManager)
class PrincipalRoleManager(SecurityMap):
"""Mappings between principals and roles."""
- implements(IPrincipalRoleManager)
-
def assignRoleToPrincipal(self, role_id, principal_id, check=True):
''' See the interface IPrincipalRoleManager '''
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/role.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/role.py 2012-05-18 15:49:38 UTC (rev 126151)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/role.py 2012-05-18 15:57:35 UTC (rev 126152)
@@ -17,7 +17,7 @@
from persistent import Persistent
-from zope.interface import implements
+from zope.interface import implementer
from zope.component import getUtilitiesFor
from zope.location import Location
@@ -27,8 +27,8 @@
NULL_ID = _('<role not activated>')
+ at implementer(IRole)
class Role(object):
- implements(IRole)
def __init__(self, id, title, description=""):
self.id = id
@@ -36,8 +36,8 @@
self.description = description
+ at implementer(IRole)
class LocalRole(Persistent, Location):
- implements(IRole)
def __init__(self, title, description=""):
self.id = NULL_ID
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/rolepermission.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/rolepermission.py 2012-05-18 15:49:38 UTC (rev 126151)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/rolepermission.py 2012-05-18 15:57:35 UTC (rev 126152)
@@ -13,7 +13,7 @@
##############################################################################
"""Permission to Roles Manager (Adapter)
"""
-from zope.interface import implements
+from zope.interface import implementer
from zope.security.permission import allPermissions
from zope.securitypolicy.role import checkRole
@@ -23,6 +23,7 @@
from zope.securitypolicy.securitymap import SecurityMap
+ at implementer(IRolePermissionManager)
class AnnotationRolePermissionManager(AnnotationSecurityMap):
"""Provide adapter that manages role permission data in an object attribute
"""
@@ -31,8 +32,6 @@
# location, but cannot change without breaking existing databases
key = 'zope.app.security.AnnotationRolePermissionManager'
- implements(IRolePermissionManager)
-
def grantPermissionToRole(self, permission_id, role_id):
AnnotationSecurityMap.addCell(self, permission_id, role_id, Allow)
@@ -49,11 +48,10 @@
self, permission_id, role_id, default)
+ at implementer(IRolePermissionManager)
class RolePermissionManager(SecurityMap):
"""Mappings between roles and permissions."""
- implements(IRolePermissionManager)
-
def grantPermissionToRole(self, permission_id, role_id, check=True):
'''See interface IRolePermissionMap'''
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/__init__.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/__init__.py 2012-05-18 15:49:38 UTC (rev 126151)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/__init__.py 2012-05-18 15:57:35 UTC (rev 126152)
@@ -11,16 +11,15 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-from zope.interface import implements
+from zope.interface import implementer
from zope.authentication.interfaces import IAuthentication, PrincipalLookupError
from zope.security.interfaces import IPrincipal
+ at implementer(IAuthentication)
class DummyPrincipalRegistry(object):
"""Dummy principal registry that only implements getPrincipal
and definePrincipal method that are needed for securitypolicy tests."""
- implements(IAuthentication)
-
def __init__(self):
self._principals = {}
@@ -36,11 +35,10 @@
principalRegistry = DummyPrincipalRegistry()
+ at implementer(IPrincipal)
class DummyPrincipal(object):
"""Very simple principal implementation"""
- implements(IPrincipal)
-
def __init__(self, id, title=u'', description=u''):
self.id = id
self.title = title
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py 2012-05-18 15:49:38 UTC (rev 126151)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py 2012-05-18 15:57:35 UTC (rev 126152)
@@ -17,7 +17,7 @@
from zope.component import provideAdapter, provideUtility
from zope.component.testing import PlacelessSetup
-from zope.interface import implements
+from zope.interface import implementer
from zope.annotation.attribute import AttributeAnnotations
from zope.annotation.interfaces import IAttributeAnnotatable
from zope.security.interfaces import IPermission
@@ -29,8 +29,9 @@
from zope.securitypolicy.tests import principalRegistry
+ at implementer(IAttributeAnnotatable)
class Manageable(object):
- implements(IAttributeAnnotatable)
+ pass
class Test(PlacelessSetup, unittest.TestCase):
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalrolemanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalrolemanager.py 2012-05-18 15:49:38 UTC (rev 126151)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalrolemanager.py 2012-05-18 15:57:35 UTC (rev 126152)
@@ -15,7 +15,7 @@
"""
import unittest
import zope.component
-from zope.interface import implements
+from zope.interface import implementer
from zope.annotation.interfaces import IAttributeAnnotatable
from zope.component.testing import PlacelessSetup
@@ -27,8 +27,9 @@
from zope.securitypolicy.role import Role
from zope.securitypolicy.tests import principalRegistry
+ at implementer(IAttributeAnnotatable)
class Manageable(object):
- implements(IAttributeAnnotatable)
+ pass
def defineRole(id, title=None, description=None):
role = Role(id, title, description)
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationrolepermissionmanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationrolepermissionmanager.py 2012-05-18 15:49:38 UTC (rev 126151)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationrolepermissionmanager.py 2012-05-18 15:57:35 UTC (rev 126152)
@@ -16,7 +16,7 @@
import unittest
from zope.component import provideUtility, provideAdapter
from zope.component.testing import PlacelessSetup
-from zope.interface import implements
+from zope.interface import implementer
from zope.annotation.attribute import AttributeAnnotations
from zope.annotation.interfaces import IAttributeAnnotatable
from zope.security.interfaces import IPermission
@@ -27,8 +27,9 @@
from zope.securitypolicy.interfaces import IRole
from zope.securitypolicy.rolepermission import AnnotationRolePermissionManager
+ at implementer(IAttributeAnnotatable)
class Manageable(object):
- implements(IAttributeAnnotatable)
+ pass
class Test(PlacelessSetup, unittest.TestCase):
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/vocabulary.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/vocabulary.py 2012-05-18 15:49:38 UTC (rev 126151)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/vocabulary.py 2012-05-18 15:57:35 UTC (rev 126152)
@@ -18,7 +18,7 @@
__docformat__ = 'restructuredtext'
import zope.component
-from zope.interface import implements, classProvides
+from zope.interface import implementer, provider
from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary
from zope.schema.interfaces import IVocabularyFactory
@@ -26,6 +26,7 @@
from zope.securitypolicy.interfaces import IGrantVocabulary
+ at provider(IVocabularyFactory)
class RoleIdsVocabulary(SimpleVocabulary):
"""A vocabular of role IDs.
@@ -62,7 +63,6 @@
>>> tearDown()
"""
- classProvides(IVocabularyFactory)
def __init__(self, context):
terms = []
@@ -72,7 +72,7 @@
super(RoleIdsVocabulary, self).__init__(terms)
+ at provider(IVocabularyFactory)
+ at implementer(IGrantVocabulary)
class GrantVocabulary(SimpleVocabulary):
"""A vocabular for getting the RadioWidget via the Choice field."""
- classProvides(IVocabularyFactory)
- implements(IGrantVocabulary)
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.py 2012-05-18 15:49:38 UTC (rev 126151)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.py 2012-05-18 15:57:35 UTC (rev 126152)
@@ -48,8 +48,8 @@
pass
+ at zope.interface.provider(ISecurityPolicy)
class ZopeSecurityPolicy(ParanoidSecurityPolicy):
- zope.interface.classProvides(ISecurityPolicy)
def __init__(self, *args, **kw):
ParanoidSecurityPolicy.__init__(self, *args, **kw)
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.txt
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.txt 2012-05-18 15:49:38 UTC (rev 126151)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.txt 2012-05-18 15:57:35 UTC (rev 126152)
@@ -19,8 +19,9 @@
>>> import zope.interface
>>> from zope.annotation.interfaces import IAttributeAnnotatable
- >>> class Ob:
- ... zope.interface.implements(IAttributeAnnotatable)
+ >>> @zope.interface.implementer(IAttributeAnnotatable)
+ ... class Ob:
+ ... pass
>>> ob = Ob()
@@ -499,8 +500,8 @@
authentication service:
>>> from zope.authentication.interfaces import IAuthentication
- >>> class FauxPrincipals(object):
- ... zope.interface.implements(IAuthentication)
+ >>> @zope.interface.implementer(IAuthentication)
+ ... class FauxPrincipals(object):
... def __init__(self):
... self.data = {}
... def __setitem__(self, key, value):
More information about the checkins
mailing list