Merge pull request #69 from zopefoundation/fix-isort

Update `isort` to version 5

.travis.yml

@@ -3,7 +3,7 @@ language: python
 matrix:
     include:
         - python: "3.6"
-          env: TOXENV=flake8
+          env: TOXENV=lint
         - python: "2.7"
           env: TOXENV=py27
         - python: "2.7"
@@ -17,16 +17,13 @@ matrix:
           env: TOXENV=py36
         - python: "3.7"
           env: TOXENV=py37
-          dist: xenial
         - python: "3.7"
           env: TOXENV=py37-ip_range
-          dist: xenial
           after_success:
               - coverage combine
               - coveralls
         - python: "3.8"
           env: TOXENV=py38
-          dist: xenial
 
 install:
     - travis_retry pip install -U pip setuptools tox

CHANGES.rst

@@ -4,6 +4,8 @@ Change Log
 2.5 (unreleased)
 ----------------
 
+- update configuration for version 5 of ``isort``
+
 
 2.4 (2020-02-09)
 ----------------

Products/PluggableAuthService/Extensions/upgrade.py

@@ -47,16 +47,15 @@ def _replaceUserFolder(self, RESPONSE=None):
     preserving users and passwords, if possible
     """
     from Acquisition import aq_base
-    from Products.PluggableAuthService.PluggableAuthService \
-        import PluggableAuthService
-    from Products.PluggableAuthService.plugins.ZODBUserManager \
-        import ZODBUserManager
-    from Products.PluggableAuthService.plugins.ZODBRoleManager \
-        import ZODBRoleManager
-    from Products.PluggableAuthService.interfaces.plugins \
-        import IAuthenticationPlugin, IUserEnumerationPlugin
-    from Products.PluggableAuthService.interfaces.plugins \
-        import IRolesPlugin, IRoleEnumerationPlugin, IRoleAssignerPlugin
+
+    from .interfaces.plugins import IAuthenticationPlugin
+    from .interfaces.plugins import IRoleAssignerPlugin
+    from .interfaces.plugins import IRoleEnumerationPlugin
+    from .interfaces.plugins import IRolesPlugin
+    from .interfaces.plugins import IUserEnumerationPlugin
+    from .PluggableAuthService import PluggableAuthService
+    from .plugins.ZODBRoleManager import ZODBRoleManager
+    from .plugins.ZODBUserManager import ZODBUserManager
 
     if getattr(aq_base(self), '__allow_groups__', None):
         if self.__allow_groups__.__class__ is PluggableAuthService:

Products/PluggableAuthService/PluggableAuthService.py

@@ -35,13 +35,14 @@
 from OFS.interfaces import IObjectManager
 from OFS.interfaces import IPropertyManager
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
-from Products.PluginRegistry.PluginRegistry import PluginRegistry
-from Products.StandardCacheManagers.RAMCacheManager import RAMCacheManager
 from zExceptions import Unauthorized
 from zope.event import notify
 from ZPublisher import BeforeTraverse
 from ZTUtils import Batch
 
+from Products.PluginRegistry.PluginRegistry import PluginRegistry
+from Products.StandardCacheManagers.RAMCacheManager import RAMCacheManager
+
 from .events import PrincipalCreated
 from .interfaces.authservice import IPluggableAuthService
 from .interfaces.authservice import _noroles

Products/PluggableAuthService/PropertiedUser.py

@@ -19,10 +19,8 @@
 from Acquisition import aq_inner
 from Acquisition import aq_parent
 
-from Products.PluggableAuthService.interfaces.propertysheets import \
-    IPropertySheet
-
 from .interfaces.authservice import IPropertiedUser
+from .interfaces.propertysheets import IPropertySheet
 from .UserPropertySheet import UserPropertySheet
 from .utils import classImplements
 

Products/PluggableAuthService/UserPropertySheet.py

@@ -19,10 +19,10 @@
 from DateTime.DateTime import DateTime
 from OFS.Image import Image
 
-from Products.PluggableAuthService.interfaces.propertysheets import \
-    IPropertySheet
 from Products.PluggableAuthService.utils import classImplements
 
+from .interfaces.propertysheets import IPropertySheet
+
 
 StringTypes = (str, six.text_type)
 

Products/PluggableAuthService/__init__.py

@@ -23,10 +23,11 @@
 
 from AccessControl.Permissions import manage_users as ManageUsers
 from App.Management import Navigation
+from zExceptions import Unauthorized
+
 from Products.GenericSetup import BASE
 from Products.GenericSetup import profile_registry
 from Products.GenericSetup.tool import SetupTool
-from zExceptions import Unauthorized
 
 from . import PluggableAuthService
 from .interfaces.authservice import IPluggableAuthService

Products/PluggableAuthService/events.py

@@ -16,22 +16,16 @@
 from zope.component import subscribers
 from zope.interface import implementer
 
-from Products.PluggableAuthService.interfaces.authservice import IBasicUser
-from Products.PluggableAuthService.interfaces.events import \
-    ICredentialsUpdatedEvent
-from Products.PluggableAuthService.interfaces.events import IGroupCreatedEvent
-from Products.PluggableAuthService.interfaces.events import IGroupDeletedEvent
-from Products.PluggableAuthService.interfaces.events import IPASEvent
-from Products.PluggableAuthService.interfaces.events import \
-    IPrincipalAddedToGroupEvent
-from Products.PluggableAuthService.interfaces.events import \
-    IPrincipalCreatedEvent
-from Products.PluggableAuthService.interfaces.events import \
-    IPrincipalDeletedEvent
-from Products.PluggableAuthService.interfaces.events import \
-    IPrincipalRemovedFromGroupEvent
-from Products.PluggableAuthService.interfaces.events import \
-    IPropertiesUpdatedEvent
+from .interfaces.authservice import IBasicUser
+from .interfaces.events import ICredentialsUpdatedEvent
+from .interfaces.events import IGroupCreatedEvent
+from .interfaces.events import IGroupDeletedEvent
+from .interfaces.events import IPASEvent
+from .interfaces.events import IPrincipalAddedToGroupEvent
+from .interfaces.events import IPrincipalCreatedEvent
+from .interfaces.events import IPrincipalDeletedEvent
+from .interfaces.events import IPrincipalRemovedFromGroupEvent
+from .interfaces.events import IPropertiesUpdatedEvent
 
 
 @implementer(IPASEvent)

Products/PluggableAuthService/exportimport.py

@@ -13,11 +13,12 @@
 """Filesystem exporter / importer adapters.
 """
 
+from zope.interface import implementer
+
 from Products.GenericSetup.interfaces import IContentFactory
 from Products.GenericSetup.interfaces import IContentFactoryName
 from Products.GenericSetup.interfaces import IFilesystemExporter
 from Products.GenericSetup.interfaces import IFilesystemImporter
-from zope.interface import implementer
 
 
 def exportPAS(context):

Products/PluggableAuthService/plugins/ChallengeProtocolChooser.py

@@ -20,17 +20,15 @@
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from zope.interface import Interface
 
-from Products.PluggableAuthService.interfaces.plugins import IChallengePlugin
-from Products.PluggableAuthService.interfaces.plugins import \
-    IChallengeProtocolChooser
-from Products.PluggableAuthService.interfaces.plugins import \
-    IRequestTypeSniffer
-from Products.PluggableAuthService.interfaces.request import IBrowserRequest
-from Products.PluggableAuthService.interfaces.request import IFTPRequest
-from Products.PluggableAuthService.interfaces.request import IWebDAVRequest
-from Products.PluggableAuthService.interfaces.request import IXMLRPCRequest
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
-from Products.PluggableAuthService.utils import classImplements
+from ..interfaces.plugins import IChallengePlugin
+from ..interfaces.plugins import IChallengeProtocolChooser
+from ..interfaces.plugins import IRequestTypeSniffer
+from ..interfaces.request import IBrowserRequest
+from ..interfaces.request import IFTPRequest
+from ..interfaces.request import IWebDAVRequest
+from ..interfaces.request import IXMLRPCRequest
+from ..plugins.BasePlugin import BasePlugin
+from ..utils import classImplements
 
 
 class IChallengeProtocolChooserPlugin(Interface):

Products/PluggableAuthService/plugins/CookieAuthHelper.py

@@ -20,6 +20,7 @@
 except ImportError:  # Python < 3.1
     from base64 import decodestring as decodebytes
     from base64 import encodestring as encodebytes
+
 import codecs
 from binascii import Error
 from binascii import hexlify
@@ -36,15 +37,12 @@
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 from zope.interface import Interface
 
-from Products.PluggableAuthService.interfaces.plugins import IChallengePlugin
-from Products.PluggableAuthService.interfaces.plugins import \
-    ICredentialsResetPlugin
-from Products.PluggableAuthService.interfaces.plugins import \
-    ICredentialsUpdatePlugin
-from Products.PluggableAuthService.interfaces.plugins import \
-    ILoginPasswordHostExtractionPlugin
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
-from Products.PluggableAuthService.utils import classImplements
+from ..interfaces.plugins import IChallengePlugin
+from ..interfaces.plugins import ICredentialsResetPlugin
+from ..interfaces.plugins import ICredentialsUpdatePlugin
+from ..interfaces.plugins import ILoginPasswordHostExtractionPlugin
+from ..plugins.BasePlugin import BasePlugin
+from ..utils import classImplements
 
 
 class ICookieAuthHelper(Interface):

Products/PluggableAuthService/plugins/DelegatingMultiPlugin.py

@@ -26,16 +26,13 @@
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from zope.interface import Interface
 
-from Products.PluggableAuthService.interfaces.plugins import \
-    IAuthenticationPlugin
-from Products.PluggableAuthService.interfaces.plugins import \
-    ICredentialsResetPlugin
-from Products.PluggableAuthService.interfaces.plugins import \
-    ICredentialsUpdatePlugin
-from Products.PluggableAuthService.interfaces.plugins import IPropertiesPlugin
-from Products.PluggableAuthService.interfaces.plugins import IRolesPlugin
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
-from Products.PluggableAuthService.utils import classImplements
+from ..interfaces.plugins import IAuthenticationPlugin
+from ..interfaces.plugins import ICredentialsResetPlugin
+from ..interfaces.plugins import ICredentialsUpdatePlugin
+from ..interfaces.plugins import IPropertiesPlugin
+from ..interfaces.plugins import IRolesPlugin
+from ..plugins.BasePlugin import BasePlugin
+from ..utils import classImplements
 
 
 class IDelegatingMultiPlugin(Interface):

Products/PluggableAuthService/plugins/DomainAuthHelper.py

@@ -25,12 +25,11 @@
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from zope.interface import Interface
 
-from Products.PluggableAuthService.interfaces.plugins import \
-    IAuthenticationPlugin
-from Products.PluggableAuthService.interfaces.plugins import IExtractionPlugin
-from Products.PluggableAuthService.interfaces.plugins import IRolesPlugin
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
-from Products.PluggableAuthService.utils import classImplements
+from ..interfaces.plugins import IAuthenticationPlugin
+from ..interfaces.plugins import IExtractionPlugin
+from ..interfaces.plugins import IRolesPlugin
+from ..plugins.BasePlugin import BasePlugin
+from ..utils import classImplements
 
 
 try:

Products/PluggableAuthService/plugins/DynamicGroupsPlugin.py

@@ -30,15 +30,14 @@
 from zope.event import notify
 from zope.interface import Interface
 
-from Products.PluggableAuthService.events import GroupCreated
-from Products.PluggableAuthService.interfaces.plugins import \
-    IGroupEnumerationPlugin
-from Products.PluggableAuthService.interfaces.plugins import IGroupsPlugin
-from Products.PluggableAuthService.permissions import ManageGroups
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
-from Products.PluggableAuthService.utils import classImplements
-from Products.PluggableAuthService.utils import createViewName
-from Products.PluggableAuthService.utils import csrf_only
+from ..events import GroupCreated
+from ..interfaces.plugins import IGroupEnumerationPlugin
+from ..interfaces.plugins import IGroupsPlugin
+from ..permissions import ManageGroups
+from ..plugins.BasePlugin import BasePlugin
+from ..utils import classImplements
+from ..utils import createViewName
+from ..utils import csrf_only
 
 
 class IDynamicGroupsPlugin(Interface):

Products/PluggableAuthService/plugins/HTTPBasicAuthHelper.py

@@ -19,13 +19,11 @@
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from zope.interface import Interface
 
-from Products.PluggableAuthService.interfaces.plugins import IChallengePlugin
-from Products.PluggableAuthService.interfaces.plugins import \
-    ICredentialsResetPlugin
-from Products.PluggableAuthService.interfaces.plugins import \
-    ILoginPasswordHostExtractionPlugin
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
-from Products.PluggableAuthService.utils import classImplements
+from ..interfaces.plugins import IChallengePlugin
+from ..interfaces.plugins import ICredentialsResetPlugin
+from ..interfaces.plugins import ILoginPasswordHostExtractionPlugin
+from ..plugins.BasePlugin import BasePlugin
+from ..utils import classImplements
 
 
 manage_addHTTPBasicAuthHelperForm = PageTemplateFile(

Products/PluggableAuthService/plugins/InlineAuthHelper.py

@@ -20,11 +20,10 @@
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from zope.interface import Interface
 
-from Products.PluggableAuthService.interfaces.plugins import IChallengePlugin
-from Products.PluggableAuthService.interfaces.plugins import \
-    ILoginPasswordHostExtractionPlugin
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
-from Products.PluggableAuthService.utils import classImplements
+from ..interfaces.plugins import IChallengePlugin
+from ..interfaces.plugins import ILoginPasswordHostExtractionPlugin
+from ..plugins.BasePlugin import BasePlugin
+from ..utils import classImplements
 
 
 class IInlineAuthHelper(Interface):

Products/PluggableAuthService/plugins/NotCompetentHelper.py

@@ -32,10 +32,9 @@
 from ZPublisher.BaseRequest import UNSPECIFIED_ROLES
 from ZPublisher.HTTPResponse import HTTPResponse as Response
 
-from Products.PluggableAuthService.interfaces.plugins import \
-    INotCompetentPlugin
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
-from Products.PluggableAuthService.utils import classImplements
+from ..interfaces.plugins import INotCompetentPlugin
+from ..plugins.BasePlugin import BasePlugin
+from ..utils import classImplements
 
 
 class HigherLevelUserFolderAccessMixin(object):

Products/PluggableAuthService/plugins/RequestTypeSniffer.py

@@ -20,18 +20,18 @@
 from zope.interface import Interface
 from ZPublisher import xmlrpc
 
-from Products.PluggableAuthService import HAVE_ZSERVER
-from Products.PluggableAuthService.interfaces.plugins import \
-    IRequestTypeSniffer
-from Products.PluggableAuthService.interfaces.request import IBrowserRequest
-from Products.PluggableAuthService.interfaces.request import IWebDAVRequest
-from Products.PluggableAuthService.interfaces.request import IXMLRPCRequest
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
-from Products.PluggableAuthService.utils import classImplements
+from .. import HAVE_ZSERVER
+from ..interfaces.plugins import IRequestTypeSniffer
+from ..interfaces.request import IBrowserRequest
+from ..interfaces.request import IWebDAVRequest
+from ..interfaces.request import IXMLRPCRequest
+from ..plugins.BasePlugin import BasePlugin
+from ..utils import classImplements
 
 
 if HAVE_ZSERVER:
     from ZServer.FTPRequest import FTPRequest
+
     from Products.PluggableAuthService.interfaces.request import IFTPRequest
 
 

Products/PluggableAuthService/plugins/ScriptablePlugin.py

@@ -14,7 +14,6 @@
 """ Class: ScriptablePlugin
 """
 
-import Products
 from AccessControl import ClassSecurityInfo
 from AccessControl.class_init import InitializeClass
 from AccessControl.Permissions import manage_users as ManageUsers
@@ -24,6 +23,7 @@
 from zope.interface import implementedBy
 from zope.interface import providedBy
 
+import Products
 from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
 from Products.PluggableAuthService.utils import classImplements
 from Products.PluggableAuthService.utils import directlyProvides

Products/PluggableAuthService/plugins/SearchPrincipalsPlugin.py

@@ -22,12 +22,10 @@
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from zope.interface import Interface
 
-from Products.PluggableAuthService.interfaces.plugins import \
-    IGroupEnumerationPlugin
-from Products.PluggableAuthService.interfaces.plugins import \
-    IUserEnumerationPlugin
-from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
-from Products.PluggableAuthService.utils import classImplements
+from ..interfaces.plugins import IGroupEnumerationPlugin
+from ..interfaces.plugins import IUserEnumerationPlugin
+from ..plugins.BasePlugin import BasePlugin
+from ..utils import classImplements
 
 
 class ISearchPrincipalsPlugin(Interface):