fix some deprecation warnings

Products/CMFPlone/Portal.py

@@ -5,6 +5,15 @@
 from ComputedAttribute import ComputedAttribute
 from five.localsitemanager.registry import PersistentComponents
 from OFS.ObjectManager import REPLACEABLE
+from plone.base import PloneMessageFactory as _
+from plone.base.interfaces.siteroot import IPloneSiteRoot
+from plone.base.interfaces.syndication import ISyndicatable
+from plone.base.permissions import AddPortalContent
+from plone.base.permissions import AddPortalFolders
+from plone.base.permissions import ListPortalMembers
+from plone.base.permissions import ModifyPortalContent
+from plone.base.permissions import ReplyToItem
+from plone.base.permissions import View
 from plone.dexterity.content import Container
 from Products.CMFCore import permissions
 from Products.CMFCore.interfaces import IContentish
@@ -23,21 +32,12 @@
 from Products.CMFCore.utils import getToolByName
 from Products.CMFCore.utils import UniqueObject
 from Products.CMFPlone import bbb
-from Products.CMFPlone import PloneMessageFactory as _
-from plone.base.interfaces.siteroot import IPloneSiteRoot
-from plone.base.interfaces.syndication import ISyndicatable
-from Products.CMFPlone.permissions import AddPortalContent
-from Products.CMFPlone.permissions import AddPortalFolders
-from Products.CMFPlone.permissions import ListPortalMembers
-from Products.CMFPlone.permissions import ModifyPortalContent
-from Products.CMFPlone.permissions import ReplyToItem
-from Products.CMFPlone.permissions import View
 from Products.Five.component.interfaces import IObjectManagerSite
-from zope.interface.interfaces import ComponentLookupError
 from zope.event import notify
 from zope.interface import classImplementsOnly
 from zope.interface import implementedBy
 from zope.interface import implementer
+from zope.interface.interfaces import ComponentLookupError
 from zope.traversing.interfaces import BeforeTraverseEvent
 
 

Products/CMFPlone/RegistrationTool.py

@@ -9,18 +9,18 @@
 from Acquisition import aq_chain
 from email import message_from_string
 from hashlib import md5
+from plone.base import PloneMessageFactory as _
+from plone.base.interfaces import ISecuritySchema
 from plone.base.permissions import ManagePortal
 from plone.registry.interfaces import IRegistry
 from Products.CMFCore.interfaces import ISiteRoot
 from Products.CMFCore.permissions import AddPortalMember
 from Products.CMFCore.RegistrationTool import RegistrationTool as BaseTool
 from Products.CMFCore.utils import _checkPermission
 from Products.CMFCore.utils import getToolByName
-from Products.CMFPlone import PloneMessageFactory as _
-from plone.base.interfaces import ISecuritySchema
 from Products.CMFPlone.PloneBaseTool import PloneBaseTool
 from Products.CMFPlone.PloneTool import EMAIL_RE
-from Products.PluggableAuthService.interfaces.authservice import IPluggableAuthService  # noqa: E501
+from Products.PluggableAuthService.interfaces.authservice import IPluggableAuthService
 from Products.PluggableAuthService.interfaces.plugins import IValidationPlugin
 from Products.PluggableAuthService.permissions import SetOwnPassword
 from smtplib import SMTPException

Products/CMFPlone/events.py

@@ -1,14 +1,12 @@
+from plone.base.interfaces import IReorderedEvent
+from plone.base.interfaces import ISiteManagerCreatedEvent
+from plone.base.utils import get_installer
 from zope.interface import implementer
 from zope.interface.interfaces import ObjectEvent
-from Products.CMFPlone.utils import get_installer
-
-from .interfaces import ISiteManagerCreatedEvent
-from .interfaces import IReorderedEvent
 
 
 @implementer(ISiteManagerCreatedEvent)
 class SiteManagerCreatedEvent(ObjectEvent):
-
     pass
 
 

Products/CMFPlone/resources/utils.py

@@ -1,11 +1,11 @@
 from Acquisition import aq_base
 from Acquisition import aq_inner
 from Acquisition import aq_parent
+from plone.base.interfaces.resources import OVERRIDE_RESOURCE_DIRECTORY_NAME
 from plone.resource.file import FilesystemFile
 from plone.resource.interfaces import IResourceDirectory
 from Products.CMFCore.Expression import createExprContext
 from Products.CMFCore.utils import getToolByName
-from Products.CMFPlone.interfaces.resources import OVERRIDE_RESOURCE_DIRECTORY_NAME
 from zExceptions import NotFound
 from zope.component import queryUtility