Drop support for Python 2.7 up to 3.6.

setup.py

@@ -12,7 +12,7 @@
 #
 ##############################################################################
 # This package is developed by the Zope Toolkit project, documented here:
-# http://docs.zope.org/zopetoolkit
+# https://zopetoolkit.readthedocs.io/
 # When developing and releasing this package, please follow the documented
 # Zope Toolkit policies as described by this documentation.
 ##############################################################################
@@ -33,7 +33,7 @@ def read(*rnames):
     name='zope.securitypolicy',
     version='5.0.dev0',
     author='Zope Foundation and Contributors',
-    author_email='zope-dev@zope.org',
+    author_email='zope-dev@zope.dev',
     description='Default security policy for Zope3',
     long_description=(
         read('README.rst')
@@ -66,6 +66,7 @@ def read(*rnames):
     packages=find_packages('src'),
     package_dir={'': 'src'},
     namespace_packages=['zope'],
+    python_requires='>=3.7',
     install_requires=[
         'persistent',
         'setuptools',

src/zope/securitypolicy/grantinfo.py

@@ -35,7 +35,7 @@
 
 
 @implementer(IGrantInfo)
-class AnnotationGrantInfo(object):
+class AnnotationGrantInfo:
 
     def __init__(self, context):
         self._context = context

src/zope/securitypolicy/interfaces.py

@@ -33,19 +33,19 @@ class IRole(Interface):
     """A role object."""
 
     id = TextLine(
-        title=u"Id",
-        description=u"Id as which this role will be known and used.",
+        title="Id",
+        description="Id as which this role will be known and used.",
         readonly=True,
         required=True)
 
     title = TextLine(
-        title=u"Title",
-        description=u"Provides a title for the role.",
+        title="Title",
+        description="Provides a title for the role.",
         required=True)
 
     description = Text(
-        title=u"Description",
-        description=u"Provides a description for the role.",
+        title="Description",
+        description="Provides a description for the role.",
         required=False)
 
 

src/zope/securitypolicy/metadirectives.py

@@ -24,13 +24,13 @@ class ISecurityObjectAssignmentDirective(Interface):
     """Abstract schema for security policy declarations."""
 
     principal = Id(
-        title=u"Principal",
-        description=u"Specifies the Principal to be mapped.",
+        title="Principal",
+        description="Specifies the Principal to be mapped.",
         required=False)
 
     role = Id(
-        title=u"Role",
-        description=u"Specifies the Role to be mapped.",
+        title="Role",
+        description="Specifies the Role to be mapped.",
         required=False)
 
 
@@ -43,15 +43,15 @@ class ISpecificSecurityObjectAssignmentDirective(
     """Abstract schema to set up one or more permissions"""
 
     permission = Permission(
-        title=u"Permission",
-        description=u"Specifies the Permission to be mapped.",
+        title="Permission",
+        description="Specifies the Permission to be mapped.",
         required=False)
 
     permissions = Tokens(
-        title=u"Permissions",
+        title="Permissions",
         description=(
-            u"Specifies a whitespace-separated list of permissions to be "
-            u"mapped."),
+            "Specifies a whitespace-separated list of permissions to be "
+            "mapped."),
         value_type=Permission(),
         required=False)
 

src/zope/securitypolicy/role.py

@@ -28,7 +28,7 @@
 
 
 @implementer(IRole)
-class Role(object):
+class Role:
 
     def __init__(self, id, title, description=""):
         self.id = id
@@ -58,7 +58,7 @@ def setIdOnActivation(role, event):
 
     >>> role1 = LocalRole('Role 1', 'A first role')
     >>> role1.id
-    u'<role not activated>'
+    '<role not activated>'
     >>> import zope.interface.interfaces
     >>> event = zope.interface.interfaces.Registered(
     ...     Registration(role1, 'role1'))
@@ -96,7 +96,7 @@ def unsetIdOnDeactivation(role, event):
 
     >>> unsetIdOnDeactivation(role1, event)
     >>> role1.id
-    u'<role not activated>'
+    '<role not activated>'
     """
     role.id = NULL_ID
 

src/zope/securitypolicy/securitymap.py

@@ -18,7 +18,7 @@
 from zope.security.management import queryInteraction
 
 
-class SecurityMap(object):
+class SecurityMap:
 
     def __init__(self):
         self._clear()

src/zope/securitypolicy/settings.py

@@ -19,7 +19,7 @@
 """
 
 
-class PermissionSetting(object):
+class PermissionSetting:
     """PermissionSettings should be considered as immutable.
     They can be compared by identity. They are identified by
     their name.

src/zope/securitypolicy/tests/__init__.py

@@ -18,7 +18,7 @@
 
 
 @implementer(IAuthentication)
-class DummyPrincipalRegistry(object):
+class DummyPrincipalRegistry:
     """Dummy principal registry that only implements getPrincipal
     and definePrincipal method that are needed for securitypolicy tests."""
 
@@ -30,7 +30,7 @@ def getPrincipal(self, id):
             raise PrincipalLookupError(id)
         return self._principals[id]
 
-    def definePrincipal(self, id, title=u'', description=u''):
+    def definePrincipal(self, id, title='', description=''):
         p = DummyPrincipal(id, title, description)
         self._principals[id] = p
         return p
@@ -40,10 +40,10 @@ def definePrincipal(self, id, title=u'', description=u''):
 
 
 @implementer(IPrincipal)
-class DummyPrincipal(object):
+class DummyPrincipal:
     """Very simple principal implementation"""
 
-    def __init__(self, id, title=u'', description=u''):
+    def __init__(self, id, title='', description=''):
         self.id = id
         self.title = title
         self.description = description

src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py

@@ -33,14 +33,14 @@
 
 
 @implementer(IAttributeAnnotatable)
-class Manageable(object):
+class Manageable:
     pass
 
 
 class Test(PlacelessSetup, unittest.TestCase):
 
     def setUp(self):
-        super(Test, self).setUp()
+        super().setUp()
         provideAdapter(AttributeAnnotations)
 
     def _make_principal(self, id=None, title=None):

src/zope/securitypolicy/tests/test_annotationprincipalrolemanager.py

@@ -31,7 +31,7 @@
 
 
 @implementer(IAttributeAnnotatable)
-class Manageable(object):
+class Manageable:
     pass
 
 

src/zope/securitypolicy/tests/test_annotationrolepermissionmanager.py

@@ -33,7 +33,7 @@
 
 
 @implementer(IAttributeAnnotatable)
-class Manageable(object):
+class Manageable:
     pass
 
 

src/zope/securitypolicy/tests/test_grantinfo.py

@@ -22,7 +22,7 @@
 
 # pylint:disable=protected-access
 
-class Manager(object):
+class Manager:
 
     def __init__(self):
         self._bycol = {}

src/zope/securitypolicy/tests/test_principalpermissionmanager.py

@@ -38,7 +38,7 @@ def definePermission(id, title=None, description=None):
 class Test(PlacelessSetup, unittest.TestCase):
 
     def setUp(self):
-        super(Test, self).setUp()
+        super().setUp()
         provideUtility(principalRegistry, IAuthentication)
 
     def _make_principal(self, id=None, title=None):

src/zope/securitypolicy/tests/test_principalrolemanager.py

@@ -37,7 +37,7 @@ def defineRole(id, title=None, description=None):
 class Test(PlacelessSetup, unittest.TestCase):
 
     def setUp(self):
-        super(Test, self).setUp()
+        super().setUp()
         provideUtility(principalRegistry, IAuthentication)
 
     def _make_principal(self, id=None, title=None):

src/zope/securitypolicy/tests/test_role.py

@@ -11,15 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Doctests for 'permission' module.
+"""Doctests for 'role' module.
 """
-import unittest
 from doctest import DocTestSuite
 
-from zope.securitypolicy import testing
-
 
 def test_suite():
-    return unittest.TestSuite((
-        DocTestSuite('zope.securitypolicy.role', checker=testing.checker),
-    ))
+    return DocTestSuite('zope.securitypolicy.role')

src/zope/securitypolicy/tests/test_securitydirectives.py

@@ -47,7 +47,7 @@ def defineRole(id, title=None, description=None):
 class TestBase(PlacelessSetup):
 
     def setUp(self):
-        super(TestBase, self).setUp()
+        super().setUp()
         zope.component.provideUtility(principalRegistry, IAuthentication)
 
 
@@ -70,7 +70,7 @@ def testDuplicationRegistration(self):
 class TestSecurityGrantMapping(TestBase, unittest.TestCase):
 
     def setUp(self):
-        super(TestSecurityGrantMapping, self).setUp()
+        super().setUp()
         zope.component.provideUtility(Permission('zope.Foo', ''),
                                       IPermission, 'zope.Foo')
         zope.component.provideUtility(Permission('zope.Qwer', ''),
@@ -155,7 +155,7 @@ def test_RolePrincipalMap(self):
 class TestSecurityGrantAllMapping(TestBase, unittest.TestCase):
 
     def setUp(self):
-        super(TestSecurityGrantAllMapping, self).setUp()
+        super().setUp()
         zope.component.provideUtility(Permission('zope.Qwer', ''),
                                       IPermission, 'zope.Qwer')
         zope.component.provideUtility(Permission('zope.Qux', ''),
@@ -194,7 +194,7 @@ def test_principal_and_role_not_allowed(self):
 class TestSecurityDenyMapping(TestBase, unittest.TestCase):
 
     def setUp(self):
-        super(TestSecurityDenyMapping, self).setUp()
+        super().setUp()
         zope.component.provideUtility(Permission('zope.Foo', ''),
                                       IPermission, 'zope.Foo')
         zope.component.provideUtility(Permission('zope.Qwer', ''),

src/zope/securitypolicy/tests/test_securitymap.py

@@ -24,7 +24,7 @@
 from zope.securitypolicy.securitymap import SecurityMap
 
 
-class InteractionStub(object):
+class InteractionStub:
     invalidated = 0
 
     def invalidate_cache(self):
@@ -64,7 +64,7 @@ def test_addCell(self):
 
     def test_addCell_no_invalidation(self):
 
-        class NoInvalidation(object):
+        class NoInvalidation:
             attrs = ()
 
             def __getattr__(self, name):
@@ -189,7 +189,7 @@ def test_changed_sets_map(self):
 
         from zope.securitypolicy.securitymap import AnnotationSecurityMap
 
-        class Context(object):
+        class Context:
             def __init__(self):
                 self.annotations = {}
 

src/zope/securitypolicy/tests/test_vocabulary.py

@@ -13,14 +13,8 @@
 ##############################################################################
 """Role vocabluary doc tests.
 """
-import unittest
 from doctest import DocTestSuite
 
-from zope.securitypolicy import testing
-
 
 def test_suite():
-    return unittest.TestSuite((
-        DocTestSuite(
-            'zope.securitypolicy.vocabulary', checker=testing.checker),
-    ))
+    return DocTestSuite('zope.securitypolicy.vocabulary')