isort/formatting/security decorators

Products/CMFEditions/ArchivistTool.py

@@ -31,7 +31,6 @@
 from App.class_init import InitializeClass
 from OFS.SimpleItem import SimpleItem
 from Persistence import Persistent
-
 from Products.CMFCore.utils import getToolByName
 from Products.CMFCore.utils import UniqueObject
 from Products.CMFEditions.interfaces import IArchivistTool
@@ -52,7 +51,6 @@
 from Products.CMFEditions.interfaces.IStorage import StorageUnregisteredError
 from Products.CMFEditions.utilities import dereference
 from Products.CMFEditions.utilities import KwAsAttributes
-
 from six import BytesIO
 from six.moves.cPickle import Pickler
 from six.moves.cPickle import Unpickler

Products/CMFEditions/KeepLastNVersionsTool.py

@@ -23,19 +23,16 @@
 
 """
 
-from zope.interface import implementer
-
-from App.class_init import InitializeClass
 from AccessControl import ClassSecurityInfo
-
+from App.class_init import InitializeClass
 from OFS.PropertyManager import PropertyManager
 from OFS.SimpleItem import SimpleItem
-
-from Products.CMFCore.utils import UniqueObject
 from Products.CMFCore.utils import getToolByName
-
+from Products.CMFCore.utils import UniqueObject
 from Products.CMFEditions.interfaces import IPurgePolicyTool
 from Products.CMFEditions.interfaces.IPurgePolicy import IPurgePolicy
+from zope.interface import implementer
+
 
 @implementer(IPurgePolicyTool, IPurgePolicy)
 class KeepLastNVersionsTool(UniqueObject, SimpleItem, PropertyManager):

Products/CMFEditions/ModifierRegistryTool.py

@@ -23,33 +23,27 @@
 
 """
 
-from zope.interface import implementer
-
+from AccessControl import ClassSecurityInfo
+from Acquisition import aq_base
 from App.class_init import InitializeClass
 from Missing import MV
-
-from Acquisition import aq_base
-from AccessControl import ClassSecurityInfo
 from OFS.OrderedFolder import OrderedFolder
-
-from Products.CMFCore.utils import UniqueObject, getToolByName
-
 from Products.CMFCore.permissions import ManagePortal
-
-from Products.CMFEditions.utilities import KwAsAttributes
-
+from Products.CMFCore.utils import getToolByName
+from Products.CMFCore.utils import UniqueObject
+from Products.CMFEditions import StandardModifiers
 from Products.CMFEditions.interfaces import IPortalModifierTool
 from Products.CMFEditions.interfaces.IModifier import IAttributeModifier
 from Products.CMFEditions.interfaces.IModifier import ICloneModifier
-from Products.CMFEditions.interfaces.IModifier import ISaveRetrieveModifier
-from Products.CMFEditions.interfaces.IModifier import IModifierRegistrySet
-from Products.CMFEditions.interfaces.IModifier import IModifierRegistryQuery
 from Products.CMFEditions.interfaces.IModifier import IConditionalModifier
 from Products.CMFEditions.interfaces.IModifier import IConditionalTalesModifier
-
-from Products.CMFEditions import StandardModifiers
+from Products.CMFEditions.interfaces.IModifier import IModifierRegistryQuery
+from Products.CMFEditions.interfaces.IModifier import IModifierRegistrySet
+from Products.CMFEditions.interfaces.IModifier import ISaveRetrieveModifier
 from Products.CMFEditions.Modifiers import ConditionalModifier
 from Products.CMFEditions.Modifiers import ConditionalTalesModifier
+from Products.CMFEditions.utilities import KwAsAttributes
+from zope.interface import implementer
 
 
 @implementer(

Products/CMFEditions/Modifiers.py

@@ -23,20 +23,20 @@
 
 """
 
+from Acquisition import aq_base
+from Acquisition import aq_inner
+from Acquisition import aq_parent
 from App.class_init import InitializeClass
-from Acquisition import aq_base, aq_parent, aq_inner
-from zope.interface import implementer
-
 from OFS.SimpleItem import SimpleItem
-from Products.PageTemplates.PageTemplateFile import PageTemplateFile
-from Products.PageTemplates.Expressions import SecureModuleImporter
-from Products.PageTemplates.Expressions import getEngine
-
-from Products.CMFCore.utils import getToolByName
 from Products.CMFCore.Expression import Expression
-
-from Products.CMFEditions.interfaces.IModifier import IConditionalTalesModifier
+from Products.CMFCore.utils import getToolByName
 from Products.CMFEditions.interfaces.IModifier import IConditionalModifier
+from Products.CMFEditions.interfaces.IModifier import IConditionalTalesModifier
+from Products.PageTemplates.Expressions import getEngine
+from Products.PageTemplates.Expressions import SecureModuleImporter
+from Products.PageTemplates.PageTemplateFile import PageTemplateFile
+from zope.interface import implementer
+
 
 manage_addModifierForm = PageTemplateFile('www/modifierAddForm.pt',
                                           globals(),

Products/CMFEditions/Permissions.py

@@ -25,6 +25,7 @@
 
 from Products.CMFCore.permissions import setDefaultRoles
 
+
 ApplyVersionControl = 'CMFEditions: Apply version control'
 setDefaultRoles(ApplyVersionControl, ('Manager', 'Site Administrator'))
 
@@ -45,4 +46,3 @@
 
 ManageVersioningPolicies = 'CMFEditions: Manage versioning policies'
 setDefaultRoles(ManageVersioningPolicies, ('Manager', 'Site Administrator'))
-

Products/CMFEditions/ReferenceFactoriesTool.py

@@ -23,19 +23,17 @@
 
 """
 
-from App.class_init import InitializeClass
 from AccessControl import ClassSecurityInfo
-from zope.interface import implementer
-
-from Acquisition import aq_parent, aq_inner
+from Acquisition import aq_inner
+from Acquisition import aq_parent
+from App.class_init import InitializeClass
 from OFS.OrderedFolder import OrderedFolder
-
-from Products.CMFCore.utils import UniqueObject, getToolByName
-
+from Products.CMFCore.utils import getToolByName
+from Products.CMFCore.utils import UniqueObject
+from Products.CMFEditions.interfaces.IReferenceFactories import IReferenceFactories
 from Products.CMFEditions.utilities import generateId
+from zope.interface import implementer
 
-from Products.CMFEditions.interfaces.IReferenceFactories \
-    import IReferenceFactories
 
 @implementer(
         IReferenceFactories,)

Products/CMFEditions/StandardModifiers.py

@@ -29,8 +29,6 @@
 from App.class_init import InitializeClass
 from OFS.ObjectManager import ObjectManager
 from Products.BTreeFolder2.BTreeFolder2 import BTreeFolder2Base
-from Products.PageTemplates.PageTemplateFile import PageTemplateFile
-
 from Products.CMFCore.Expression import Expression
 from Products.CMFCore.permissions import ManagePortal
 from Products.CMFCore.utils import getToolByName
@@ -43,11 +41,11 @@
 from Products.CMFEditions.interfaces.IModifier import ISaveRetrieveModifier
 from Products.CMFEditions.Modifiers import ConditionalModifier
 from Products.CMFEditions.Modifiers import ConditionalTalesModifier
-
+from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from ZODB.blob import Blob
-from zope.copy import copy
 from zope.component.interfaces import ComponentLookupError
 from zope.component.interfaces import IPossibleSite
+from zope.copy import copy
 from zope.interface import implementer
 from zope.interface import Interface
 

Products/CMFEditions/StorageMigrationSupport.py

@@ -24,11 +24,13 @@
 Creating a test hierarchy for migration tests.
 
 """
+from Products.CMFCore.utils import getToolByName
+from Products.CMFEditions import PACKAGE_HOME
+
 import logging
 import os.path
 import time
-from Products.CMFCore.utils import getToolByName
-from Products.CMFEditions import PACKAGE_HOME
+
 
 logger = logging.getLogger('CMFEditions')
 

Products/CMFEditions/UniqueIdHandlerTool.py

@@ -1,5 +1,6 @@
 from zope.deferredimport import deprecated
 
+
 deprecated("UniqueIdHandlerTool has been removed; "
     "use Products.CMFEditions.historyidhandlertool.HistoryIdHandlerTool or "
     "Products.CMFUid.UniqueIdHandlerTool.UniqueIdHandlerTool",

Products/CMFEditions/ZVCStorageTool.py

@@ -30,11 +30,9 @@
 from BTrees.OOBTree import OOBTree
 from OFS.SimpleItem import SimpleItem
 from Persistence import Persistent
-
 from Products.CMFCore.permissions import ManagePortal
 from Products.CMFCore.utils import getToolByName
 from Products.CMFCore.utils import UniqueObject
-
 from Products.CMFEditions.interfaces import IStorageTool
 from Products.CMFEditions.interfaces.IStorage import IHistory
 from Products.CMFEditions.interfaces.IStorage import IPurgeSupport
@@ -48,12 +46,10 @@
 from Products.CMFEditions.interfaces.IStorage import StorageSaveError
 from Products.CMFEditions.interfaces.IStorage import StorageUnregisteredError
 from Products.CMFEditions.Permissions import AccessPreviousVersions
-
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.ZopeVersionControl.EventLog import LogEntry
 from Products.ZopeVersionControl.Utility import VersionControlError
 from Products.ZopeVersionControl.ZopeRepository import ZopeRepository
-
 from six import BytesIO
 from six.moves.cPickle import dumps
 from six.moves.cPickle import HIGHEST_PROTOCOL

Products/CMFEditions/__init__.py

@@ -23,20 +23,20 @@
 """
 
 
-from App.Common import package_home
 from AccessControl import ModuleSecurityInfo
-
+from App.Common import package_home
 from Products.CMFCore import utils
-
-from Products.CMFEditions import historyidhandlertool
-from Products.CMFEditions import ModifierRegistryTool
 from Products.CMFEditions import ArchivistTool
-from Products.CMFEditions import ZVCStorageTool
 from Products.CMFEditions import CopyModifyMergeRepositoryTool
-from Products.CMFEditions import ReferenceFactoriesTool
+from Products.CMFEditions import historyidhandlertool
 from Products.CMFEditions import KeepLastNVersionsTool
-
+from Products.CMFEditions import ModifierRegistryTool
+from Products.CMFEditions import ReferenceFactoriesTool
 from Products.CMFEditions import StandardModifiers
+from Products.CMFEditions import ZVCStorageTool
+# Set up a MessageFactory for the cmfeditions domain
+from zope.i18nmessageid import MessageFactory
+
 
 GLOBALS = globals()
 PACKAGE_HOME = package_home(GLOBALS)
@@ -52,8 +52,6 @@
     )
 
 
-# Set up a MessageFactory for the cmfeditions domain
-from zope.i18nmessageid import MessageFactory
 CMFEditionsMessageFactory = MessageFactory('cmfeditions')
 
 ModuleSecurityInfo('Products.CMFEditions').declarePublic('CMFEditionsMessageFactory')

Products/CMFEditions/browser/__init__.py

@@ -1,2 +1 @@
 # -*- coding: utf-8 -*-
-

Products/CMFEditions/browser/utils.py

@@ -3,6 +3,7 @@
 
 import logging
 
+
 logger = logging.getLogger(__name__)
 
 

Products/CMFEditions/browser/views.py

@@ -1,13 +1,14 @@
 from Acquisition import aq_inner
-from Products.Five import BrowserView
 from Products.CMFCore.utils import getToolByName
 from Products.CMFEditions import CMFEditionsMessageFactory as _
 from Products.CMFEditions.interfaces.IModifier import FileTooLargeToVersionError
 from Products.CMFEditions.utilities import isObjectChanged
 from Products.CMFEditions.utilities import isObjectVersioned
 from Products.CMFEditions.utilities import maybeSaveVersion
+from Products.Five import BrowserView
 from Products.statusmessages.interfaces import IStatusMessage
 
+
 class UpdateVersionOnEditView(BrowserView):
 
     def success(self):

Products/CMFEditions/exportimport/repository.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 from Products.CMFCore.utils import getToolByName
-from Products.GenericSetup.utils import XMLAdapterBase
+from Products.CMFEditions.VersionPolicies import VersionPolicy
 from Products.GenericSetup.utils import exportObjects
 from Products.GenericSetup.utils import importObjects
+from Products.GenericSetup.utils import XMLAdapterBase
 from zope.dottedname.resolve import resolve
 
-from Products.CMFEditions.VersionPolicies import VersionPolicy
 
 class RepositoryToolXMLAdapter(XMLAdapterBase):
     """Mode in- and exporter for RepositoryTool.

Products/CMFEditions/interfaces/IArchivist.py

@@ -23,7 +23,8 @@
 
 """
 
-from zope.interface import Interface, Attribute
+from zope.interface import Attribute
+from zope.interface import Interface
 
 
 class IArchivist(Interface):

Products/CMFEditions/interfaces/IModifier.py

@@ -28,6 +28,7 @@
 
 from zope.interface import Interface
 
+
 class IAttributeModifier(Interface):
     """The simplest possible modifier, it indicates, which attributes
        shouldn't be copied by the archivist, but be passed to the the storage

Products/CMFEditions/interfaces/IRepository.py

@@ -40,7 +40,8 @@
 
 """
 
-from zope.interface import Interface, Attribute
+from zope.interface import Attribute
+from zope.interface import Interface
 
 
 class ICopyModifyMergeRepository(Interface):

Products/CMFEditions/interfaces/IStorage.py

@@ -28,7 +28,9 @@
 
 """
 
-from zope.interface import Interface, Attribute
+from zope.interface import Attribute
+from zope.interface import Interface
+
 
 class IStorage(Interface):
     """Manages Storing and Retrieving Version to and from the Storage

Products/CMFEditions/interfaces/__init__.py

@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
-from zope import interface
-
 from Products.CMFEditions.interfaces._tools import IArchivistTool  # noqa: F401
 from Products.CMFEditions.interfaces._tools import IPortalModifierTool  # noqa: F401,E501
 from Products.CMFEditions.interfaces._tools import IPurgePolicyTool  # noqa: F401,E501
 from Products.CMFEditions.interfaces._tools import IStorageTool  # noqa: F401
+from zope import interface
 
 
 class IVersioned(interface.Interface):

Products/CMFEditions/setuphandlers.py

@@ -6,6 +6,7 @@
 from Products.CMFCore.utils import getToolByName
 from Products.CMFEditions import StandardModifiers
 
+
 def importVarious(context):
     """
     Import various settings.

Products/CMFEditions/skins/CMFEditions/checkUpToDate.py

@@ -8,6 +8,8 @@
 ##title=Check if Up To Date
 ##
 from Products.CMFCore.utils import getToolByName
+
+
 repo = getToolByName(context, "portal_repository", None)
 
 isModified = None

Products/CMFEditions/skins/CMFEditions/createTestHierarchy.py

@@ -8,6 +8,8 @@
 ##title=Create a test hierarchy for migration tests
 ##
 from Products.CMFCore.utils import getToolByName
+
+
 repo = getToolByName(context, "portal_repository", None)
 
 if repo is not None:

Products/CMFEditions/skins/CMFEditions/migrateStorage.py

@@ -8,6 +8,8 @@
 ##title=Migrate the Storage
 ##
 from Products.CMFCore.utils import getToolByName
+
+
 storage = getToolByName(context, "portal_historiesstorage")
 result = storage.migrateStorage()
 if result is None:

Products/CMFEditions/skins/CMFEditions/saveasnewversion.py

@@ -10,6 +10,7 @@
 
 from Products.CMFCore.utils import getToolByName
 
+
 pr = getToolByName(context, 'portal_repository', None)
 if pr is not None:
     pr.save(obj=context, comment=versioncomment)