isort config and apply

setup.cfg

@@ -4,10 +4,30 @@ ignore =
     bootstrap.py
 
 [isort]
-force_alphabetical_sort = True
+force_alphabetical_sort = False
 force_single_line = True
-lines_after_imports = 2
+force_to_top = False
+from_first = True
+
+sections = FUTURE,STDLIB,COMPATLIB,FIRSTPARTY,THIRDPARTY,ZOPE,LOCALFOLDER
+
+known_compatlib = six
+known_firstparty =
+known_thirdparty =
+known_zope = zope,Products,zc,z3c,ExtensionClass,Acquisition,Persistence,RestrictedPython
+known_localfolder = AccessControl
+
+import_heading_future_library = Future Imports
+import_heading_stdlib = Standard Library Imports
+import_heading_compatlib = Python 2 / 3 compatibility helper libraries
+import_heading_firstparty =
+import_heading_thirdparty =
+import_heading_zope = Zope Imports
+import_heading_localfolder = AccessControl internal imports
+
 line_length = 200
+lines_after_imports = 2
+
 skip =
     bootstrap.py
 not_skip =
@@ -24,6 +44,5 @@ ignore =
     N805,
     N806,
     N812,
-    E301,
     F821,
     F841,

src/AccessControl/AuthEncoding.py

@@ -14,17 +14,18 @@
 # flake8: NOQA: E401
 
 from __future__ import absolute_import
+
+from AuthEncoding.AuthEncoding import MySQLDigestScheme
+from AuthEncoding.AuthEncoding import PasswordEncryptionScheme
+from AuthEncoding.AuthEncoding import SHADigestScheme
+from AuthEncoding.AuthEncoding import SSHADigestScheme
 from AuthEncoding.AuthEncoding import constant_time_compare
 from AuthEncoding.AuthEncoding import is_encrypted
 from AuthEncoding.AuthEncoding import listSchemes
-from AuthEncoding.AuthEncoding import MySQLDigestScheme
-from AuthEncoding.AuthEncoding import PasswordEncryptionScheme
 from AuthEncoding.AuthEncoding import pw_encode
 from AuthEncoding.AuthEncoding import pw_encrypt
 from AuthEncoding.AuthEncoding import pw_validate
 from AuthEncoding.AuthEncoding import registerScheme
-from AuthEncoding.AuthEncoding import SHADigestScheme
-from AuthEncoding.AuthEncoding import SSHADigestScheme
 
 
 # Bogosity on various platforms due to ITAR restrictions

src/AccessControl/DTML.py

@@ -13,6 +13,7 @@
 """Add security system support to Document Templates
 """
 
+# Zope Imports
 from zope.deferredimport import deprecated
 
 

src/AccessControl/ImplC.py

@@ -15,13 +15,14 @@
 
 """C implementation of the access control machinery."""
 
+# AccessControl internal imports
 from AccessControl.cAccessControl import SecurityManager as cSecurityManager
 from AccessControl.cAccessControl import ZopeSecurityPolicy as cZopeSecurityPolicy  # NOQA: E501
+from AccessControl.cAccessControl import PermissionRole
 from AccessControl.cAccessControl import _what_not_even_god_should_do
 from AccessControl.cAccessControl import aq_validate
 from AccessControl.cAccessControl import guarded_getattr
 from AccessControl.cAccessControl import imPermissionRole
-from AccessControl.cAccessControl import PermissionRole
 from AccessControl.cAccessControl import rolesForPermissionOn
 from AccessControl.cAccessControl import setDefaultBehaviors
 from AccessControl.ImplPython import SecurityManager

src/AccessControl/ImplPython.py

@@ -15,19 +15,22 @@
 
 # isort:skip
 
+# Standard Library Imports
+from logging import getLogger
+import os
+
+# Python 2 / 3 compatibility helper libraries
+from six import string_types
+
+# Zope Imports
 from Acquisition import aq_acquire
 from Acquisition import aq_base
 from Acquisition import aq_inContextOf
 from Acquisition import aq_inner
 from Acquisition import aq_parent
 from ExtensionClass import Base
-from logging import getLogger
-from six import string_types
 from zope.interface import implementer
 
-import os
-# import string
-
 
 # This is used when a permission maps explicitly to no permission.  We
 # try and get this from cAccessControl first to make sure that if both

src/AccessControl/Owned.py

@@ -15,14 +15,17 @@
 
 # flake8: NOQA: E401
 
+# Zope Imports
+from zope.deferredimport import deprecated
+
+# AccessControl internal imports
 # BBB
-from AccessControl.owner import absattr
 from AccessControl.owner import EditUnowned
 from AccessControl.owner import EmergencyUserCannotOwn
+from AccessControl.owner import UnownableOwner
+from AccessControl.owner import absattr
 from AccessControl.owner import ownableFilter
 from AccessControl.owner import ownerInfo
-from AccessControl.owner import UnownableOwner
-from zope.deferredimport import deprecated
 
 
 deprecated(

src/AccessControl/Permission.py

@@ -13,10 +13,12 @@
 """Permissions
 """
 
-from Acquisition import aq_base
-
+# Standard Library Imports
 import re
 
+# Zope Imports
+from Acquisition import aq_base
+
 
 _NOT_ALLOWED_CHARS = re.compile(r'[^a-zA-Z0-9_]')
 

src/AccessControl/PermissionMapping.py

@@ -17,15 +17,20 @@
 need the object's ordinary permissions intact so we can manage it.
 """
 
+# Standard Library Imports
+from cgi import escape
+
+# Zope Imports
+from Acquisition import ImplicitAcquisitionWrapper
+from ExtensionClass import Base
+from zope.interface import implementer
+
+# AccessControl internal imports
 from AccessControl.class_init import InitializeClass
 from AccessControl.interfaces import IPermissionMappingSupport
 from AccessControl.owner import UnownableOwner
 from AccessControl.Permission import getPermissionIdentifier
 from AccessControl.requestmethod import requestmethod
-from Acquisition import ImplicitAcquisitionWrapper
-from cgi import escape
-from ExtensionClass import Base
-from zope.interface import implementer
 
 
 @implementer(IPermissionMappingSupport)

src/AccessControl/Permissions.py

@@ -13,6 +13,7 @@
 """Constant definitions for built-in Zope permissions
 """
 
+# Zope Imports
 from zope.deferredimport import deprecated
 
 

src/AccessControl/Role.py

@@ -15,18 +15,21 @@
 
 # flake8: NOQA: E401
 
+# Zope Imports
+from zope.deferredimport import deprecated
+
+# AccessControl internal imports
 # BBB
+from AccessControl.rolemanager import DEFAULTMAXLISTUSERS
 from AccessControl.rolemanager import _isBeingUsedAsAMethod
 from AccessControl.rolemanager import _isNotBeingUsedAsAMethod
 from AccessControl.rolemanager import class_attrs
 from AccessControl.rolemanager import class_dict
 from AccessControl.rolemanager import classattr
-from AccessControl.rolemanager import DEFAULTMAXLISTUSERS
 from AccessControl.rolemanager import gather_permissions
 from AccessControl.rolemanager import instance_attrs
 from AccessControl.rolemanager import instance_dict
 from AccessControl.rolemanager import reqattr
-from zope.deferredimport import deprecated
 
 
 deprecated(

src/AccessControl/SecurityInfo.py

@@ -38,13 +38,17 @@
 
 """
 
-from AccessControl.class_init import InitializeClass
-from AccessControl.ImplPython import _what_not_even_god_should_do
-from Acquisition import Implicit
+# Standard Library Imports
 from logging import getLogger
+import sys
+
+# Zope Imports
+from Acquisition import Implicit
 from Persistence import Persistent
 
-import sys
+# AccessControl internal imports
+from AccessControl.class_init import InitializeClass
+from AccessControl.ImplPython import _what_not_even_god_should_do
 
 
 # always patch Persistent before ClassSecurityInfo is used

src/AccessControl/SecurityManagement.py

@@ -13,6 +13,8 @@
 """Security management
 """
 from __future__ import absolute_import
+
+# AccessControl internal imports
 from AccessControl import SpecialUsers
 
 

src/AccessControl/SecurityManager.py

@@ -13,6 +13,7 @@
 '''API module to set the security policy
 '''
 
+# AccessControl internal imports
 from AccessControl import ImplPython as _ImplPython
 # from AccessControl.SimpleObjectPolicies import _noroles
 

src/AccessControl/SimpleObjectPolicies.py

@@ -59,7 +59,6 @@
 from BTrees.OOBTree import OOBTree
 from BTrees.OOBTree import OOBucket
 from BTrees.OOBTree import OOSet
-
 import Record
 
 

src/AccessControl/User.py

@@ -15,24 +15,27 @@
 
 # flake8: NOQA: E401
 
+# Zope Imports
+from zope.deferredimport import deprecated
+
+# AccessControl internal imports
 from AccessControl.users import UnrestrictedUser as Super
+from AccessControl.users import BasicUser
+from AccessControl.users import NullUnrestrictedUser
+from AccessControl.users import SimpleUser
+from AccessControl.users import SpecialUser
+from AccessControl.users import User
 from AccessControl.users import _remote_user_mode
 from AccessControl.users import absattr
 from AccessControl.users import addr_match
-from AccessControl.users import BasicUser
 from AccessControl.users import domainSpecMatch
 from AccessControl.users import emergency_user
 from AccessControl.users import host_match
 from AccessControl.users import nobody
-from AccessControl.users import NullUnrestrictedUser
 from AccessControl.users import readUserAccessFile
 from AccessControl.users import reqattr
 from AccessControl.users import rolejoin
-from AccessControl.users import SimpleUser
-from AccessControl.users import SpecialUser
 from AccessControl.users import system
-from AccessControl.users import User
-from zope.deferredimport import deprecated
 
 
 deprecated(

src/AccessControl/ZopeGuards.py

@@ -12,25 +12,33 @@
 ##############################################################################
 
 from __future__ import absolute_import
-from AccessControl.SecurityInfo import secureModule
-from AccessControl.SecurityManagement import getSecurityManager
-from AccessControl.SimpleObjectPolicies import ContainerAssertions
-from AccessControl.SimpleObjectPolicies import Containers
+
+# Standard Library Imports
 from functools import reduce
+import math
+import random
+import string
+import warnings
+
+# Python 2 / 3 compatibility helper libraries
+import six
+
+from zExceptions import Unauthorized
+
+# Zope Imports
 from RestrictedPython.Eval import RestrictionCapableEval
 from RestrictedPython.Guards import full_write_guard
 from RestrictedPython.Guards import guarded_iter_unpack_sequence
 from RestrictedPython.Guards import guarded_unpack_sequence
 from RestrictedPython.Guards import safe_builtins
 from RestrictedPython.Utilities import utility_builtins
-from zExceptions import Unauthorized
-
-import math
-import random
 import RestrictedPython
-import six
-import string
-import warnings
+
+# AccessControl internal imports
+from AccessControl.SecurityInfo import secureModule
+from AccessControl.SecurityManagement import getSecurityManager
+from AccessControl.SimpleObjectPolicies import ContainerAssertions
+from AccessControl.SimpleObjectPolicies import Containers
 
 
 _marker = []  # Create a new marker object.

src/AccessControl/ZopeSecurityPolicy.py

@@ -13,11 +13,17 @@
 """Define Zope's default security policy
 """
 from __future__ import absolute_import
+
+# Standard Library Imports
+from types import MethodType
+
+# Python 2 / 3 compatibility helper libraries
+from six import string_types
+
+# AccessControl internal imports
 # AccessControl.Implementation inserts:
 #   ZopeSecurityPolicy, getRoles, rolesForPermissionOn
 from AccessControl.SimpleObjectPolicies import _noroles
-from six import string_types
-from types import MethodType
 
 
 rolesForPermissionOn = None  # XXX:  avoid import loop

src/AccessControl/__init__.py

@@ -13,15 +13,16 @@
 
 # flake8: NOQA: E401
 
+# AccessControl internal imports
 # This has to happen early so things get initialized properly
 from AccessControl.Implementation import setImplementation
 from AccessControl.SecurityInfo import ACCESS_NONE
 from AccessControl.SecurityInfo import ACCESS_PRIVATE
 from AccessControl.SecurityInfo import ACCESS_PUBLIC
-from AccessControl.SecurityInfo import allow_class
-from AccessControl.SecurityInfo import allow_module
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.SecurityInfo import ModuleSecurityInfo
+from AccessControl.SecurityInfo import allow_class
+from AccessControl.SecurityInfo import allow_module
 from AccessControl.SecurityInfo import secureModule
 from AccessControl.SecurityManagement import getSecurityManager
 from AccessControl.SecurityManagement import setSecurityPolicy

src/AccessControl/class_init.py

@@ -13,10 +13,12 @@
 """Class initialization.
 """
 
-from AccessControl.Permission import ApplicationDefaultPermissions  # BBB  # NOQA: F401,E501
-
+# Standard Library Imports
 import logging
 
+# AccessControl internal imports
+from AccessControl.Permission import ApplicationDefaultPermissions  # BBB  # NOQA: F401,E501
+
 
 def InitializeClass(self):
     from AccessControl.Permission import registerPermissions