Update isort to version 5.

This fixes #892

CHANGES.rst

@@ -86,6 +86,9 @@ Fixes
   Python script.
   (`#901 <https://github.com/zopefoundation/Zope/pull/901>`_)
 
+- Update `isort` to version 5.
+  (`#892 <https://github.com/zopefoundation/Zope/pull/892>`_)
+
 Other changes
 +++++++++++++
 

setup.cfg

@@ -11,14 +11,14 @@ ignore =
 force_single_line = True
 combine_as_imports = True
 sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER
-known_standard_library = _thread
+known_standard_library = _thread, urllib, os, sys, time, types, stat, warnings, html, itertools, logging, functools, binascii, io, unittest, shutil, tempfile, unittest, pkg_resources, functools, collections, re, base64, json, zlib, difflib, struct, email, random, operator, inspect, doctest, glob, ast, weakref, contextlib, codecs, cgi, copy, traceback, xmlrpc, socket, xml, configparser, optparse, locale, getopt, subprocess, mimetypes
 known_third_party = ipaddress, PasteDeploy, six, waitress, chameleon, paste
-known_zope = AccessControl, Acquisition, DateTime, DocumentTemplate, ExtensionClass, MultiMapping, Persistence, persistent, RestrictedPython, Testing, transaction, ZConfig, zExceptions, ZODB, zope, Zope2, App
+known_zope = AccessControl, Acquisition, DateTime, DocumentTemplate, ExtensionClass, MultiMapping, Persistence, persistent, RestrictedPython, transaction, ZConfig, zExceptions, ZODB, zope, Products.PageTemplates, zope.interface
+known_first_party = Products.PageTemplates, Zope2, App, OFS, Products, Testing
 default_section = ZOPE
 line_length = 79
 lines_after_imports = 2
-not_skip =
-    __init__.py
+ignore_comments = False
 
 [flake8]
 ignore =

src/App/ApplicationManager.py

@@ -19,14 +19,15 @@
 from AccessControl.class_init import InitializeClass
 from AccessControl.requestmethod import requestmethod
 from Acquisition import Implicit
+from Persistence import Persistent
+
 from App.config import getConfiguration
 from App.DavLockManager import DavLockManager
 from App.Management import Tabs
 from App.special_dtml import DTMLFile
 from App.Undo import UndoSupport
 from App.version_txt import version_txt
 from OFS.Traversable import Traversable
-from Persistence import Persistent
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 
 

src/App/DavLockManager.py

@@ -16,6 +16,7 @@
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import Implicit
 from Acquisition import aq_base
+
 from App.special_dtml import DTMLFile
 from OFS.Lockable import wl_isLocked
 from OFS.SimpleItem import Item

src/App/Extensions.py

@@ -17,9 +17,10 @@
 import os
 from functools import total_ordering
 
-import Products
 from zExceptions import NotFound
 
+import Products
+
 
 @total_ordering
 class FuncCode:

src/App/FactoryDispatcher.py

@@ -24,6 +24,7 @@
 from Acquisition import Implicit
 from Acquisition import aq_base
 from ExtensionClass import Base
+
 from OFS.metaconfigure import get_registered_packages
 
 

src/App/ImageFile.py

@@ -17,15 +17,16 @@
 import time
 import warnings
 
-import Zope2
 from AccessControl.class_init import InitializeClass
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import Explicit
+from DateTime.DateTime import DateTime
+from zope.contenttype import guess_content_type
+
+import Zope2
 from App.Common import package_home
 from App.Common import rfc1123_date
 from App.config import getConfiguration
-from DateTime.DateTime import DateTime
-from zope.contenttype import guess_content_type
 from ZPublisher.Iterators import filestream_iterator
 
 

src/App/Management.py

@@ -23,12 +23,13 @@
 from AccessControl import Unauthorized
 from AccessControl.class_init import InitializeClass
 from AccessControl.Permissions import view_management_screens
+from ExtensionClass import Base
+from zope.interface import implementer
+
 from App.interfaces import ICSSPaths
 from App.interfaces import IJSPaths
 from App.interfaces import INavigation
 from App.special_dtml import DTMLFile
-from ExtensionClass import Base
-from zope.interface import implementer
 
 
 class Tabs(Base):

src/App/ProductContext.py

@@ -16,12 +16,13 @@
 import os
 from logging import getLogger
 
-import Products
 from AccessControl.Permission import registerPermissions
 from AccessControl.PermissionRole import PermissionRole
+from zope.interface import implementedBy
+
+import Products
 from App.FactoryDispatcher import FactoryDispatcher
 from OFS.ObjectManager import ObjectManager
-from zope.interface import implementedBy
 
 
 if not hasattr(Products, 'meta_types'):

src/App/Undo.py

@@ -20,9 +20,10 @@
 from AccessControl.class_init import InitializeClass
 from AccessControl.Permissions import undo_changes
 from Acquisition import Implicit
+from DateTime.DateTime import DateTime
+
 from App.Management import Tabs
 from App.special_dtml import DTMLFile
-from DateTime.DateTime import DateTime
 
 
 class UndoSupport(Tabs, Implicit):

src/App/special_dtml.py

@@ -17,21 +17,22 @@
 import DocumentTemplate
 import MethodObject
 import Persistence
-import Zope2
 from AccessControl import getSecurityManager
 from Acquisition import Explicit
 from Acquisition import aq_acquire
 from Acquisition import aq_inner
 from Acquisition import aq_parent
-from App import Common
-from App.config import getConfiguration
 from ComputedAttribute import ComputedAttribute
 from DocumentTemplate import OLD_DEFAULT_ENCODING
 from DocumentTemplate._DocumentTemplate import InstanceDict
 from DocumentTemplate._DocumentTemplate import TemplateDict
 from DocumentTemplate._DocumentTemplate import render_blocks
 from DocumentTemplate.DT_String import DTReturn
 from DocumentTemplate.DT_String import _marker
+
+import Zope2
+from App import Common
+from App.config import getConfiguration
 from Shared.DC.Scripts.Bindings import Bindings
 
 

src/App/tests/testManagement.py

@@ -4,9 +4,10 @@
 class TestNavigation(Testing.ZopeTestCase.ZopeTestCase):
 
     def test_interfaces(self):
+        from zope.interface.verify import verifyClass
+
         from App.interfaces import INavigation
         from App.Management import Navigation
-        from zope.interface.verify import verifyClass
 
         verifyClass(INavigation, Navigation)
 

src/App/tests/test_getZopeVersion.py

@@ -14,7 +14,6 @@
 """Tests for the recreated `getZopeVersion`."""
 
 import unittest
-
 from pkg_resources import get_distribution
 
 from App.version_txt import getZopeVersion

src/App/version_txt.py

@@ -11,11 +11,10 @@
 #
 ##############################################################################
 import collections
+import pkg_resources
 import re
 import sys
 
-import pkg_resources
-
 
 _version_string = None
 _zope_version = None

src/OFS/Application.py

@@ -17,26 +17,27 @@
 import sys
 from logging import getLogger
 
-import Products
 import transaction
 from AccessControl import ClassSecurityInfo
 from AccessControl.class_init import InitializeClass
 from AccessControl.Permission import ApplicationDefaultPermissions
 from AccessControl.Permissions import view_management_screens
 from Acquisition import aq_base
+from DateTime import DateTime
+from zExceptions import Forbidden
+from zExceptions import Redirect as RedirectException
+from zope.interface import implementer
+
+import Products
 from App import FactoryDispatcher
 from App.ApplicationManager import ApplicationManager
 from App.ProductContext import ProductContext
 from App.version_txt import getZopeVersion
-from DateTime import DateTime
 from OFS.FindSupport import FindSupport
 from OFS.metaconfigure import get_packages_to_initialize
 from OFS.metaconfigure import package_initialized
 from OFS.userfolder import UserFolder
 from webdav.NullResource import NullResource
-from zExceptions import Forbidden
-from zExceptions import Redirect as RedirectException
-from zope.interface import implementer
 
 from . import Folder
 from . import misc_
@@ -291,8 +292,8 @@ def install_inituser(self):
     def install_virtual_hosting(self):
         app = self.getApp()
         if 'virtual_hosting' not in app:
-            from Products.SiteAccess.VirtualHostMonster \
-                import VirtualHostMonster
+            from Products.SiteAccess.VirtualHostMonster import \
+                VirtualHostMonster
             any_vhm = [obj for obj in app.values()
                        if isinstance(obj, VirtualHostMonster)]
             if not any_vhm:
@@ -304,8 +305,8 @@ def install_virtual_hosting(self):
     def install_root_view(self):
         app = self.getApp()
         if 'index_html' not in app:
-            from Products.PageTemplates.ZopePageTemplate \
-                import ZopePageTemplate
+            from Products.PageTemplates.ZopePageTemplate import \
+                ZopePageTemplate
             root_pt = ZopePageTemplate('index_html')
             root_pt.pt_setTitle('Auto-generated default page')
             app._setObject('index_html', root_pt)

src/OFS/Cache.py

@@ -27,6 +27,7 @@
 from Acquisition import aq_get
 from Acquisition import aq_inner
 from Acquisition import aq_parent
+
 from App.special_dtml import DTMLFile
 
 

src/OFS/CopySupport.py

@@ -33,15 +33,7 @@
 from Acquisition import aq_base
 from Acquisition import aq_inner
 from Acquisition import aq_parent
-from App.special_dtml import DTMLFile
 from ExtensionClass import Base
-from OFS.event import ObjectClonedEvent
-from OFS.event import ObjectWillBeMovedEvent
-from OFS.interfaces import ICopyContainer
-from OFS.interfaces import ICopySource
-from OFS.Moniker import Moniker
-from OFS.Moniker import loadMoniker
-from OFS.subscribers import compatibilityCall
 from zExceptions import BadRequest
 from zExceptions import ResourceLockedError
 from zExceptions import Unauthorized
@@ -52,6 +44,15 @@
 from zope.lifecycleevent import ObjectCopiedEvent
 from zope.lifecycleevent import ObjectMovedEvent
 
+from App.special_dtml import DTMLFile
+from OFS.event import ObjectClonedEvent
+from OFS.event import ObjectWillBeMovedEvent
+from OFS.interfaces import ICopyContainer
+from OFS.interfaces import ICopySource
+from OFS.Moniker import Moniker
+from OFS.Moniker import loadMoniker
+from OFS.subscribers import compatibilityCall
+
 
 class CopyError(Exception):
     pass

src/OFS/DTMLDocument.py

@@ -17,16 +17,17 @@
 
 from AccessControl import getSecurityManager
 from AccessControl.class_init import InitializeClass
-from App.special_dtml import HTML
-from App.special_dtml import DTMLFile
 from DocumentTemplate.permissions import change_dtml_documents
 from DocumentTemplate.permissions import change_dtml_methods
+from zExceptions.TracebackSupplement import PathTracebackSupplement
+from zope.contenttype import guess_content_type
+
+from App.special_dtml import HTML
+from App.special_dtml import DTMLFile
 from OFS.DTMLMethod import DTMLMethod
 from OFS.DTMLMethod import decapitate
 from OFS.DTMLMethod import safe_file_data
 from OFS.PropertyManager import PropertyManager
-from zExceptions.TracebackSupplement import PathTracebackSupplement
-from zope.contenttype import guess_content_type
 from ZPublisher.HTTPRequest import default_encoding
 
 

src/OFS/DTMLMethod.py

@@ -24,21 +24,22 @@
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.tainted import TaintedString
 from Acquisition import Implicit
-from App.special_dtml import HTML
-from App.special_dtml import DTMLFile
 from DocumentTemplate.DT_Util import ParseError
 from DocumentTemplate.permissions import change_dtml_methods
 from DocumentTemplate.security import RestrictedDTML
+from zExceptions import Forbidden
+from zExceptions import ResourceLockedError
+from zExceptions.TracebackSupplement import PathTracebackSupplement
+from zope.contenttype import guess_content_type
+
+from App.special_dtml import HTML
+from App.special_dtml import DTMLFile
 from OFS.Cache import Cacheable
 from OFS.History import Historical
 from OFS.History import html_diff
 from OFS.role import RoleManager
 from OFS.SimpleItem import Item_w__name__
 from OFS.SimpleItem import PathReprProvider
-from zExceptions import Forbidden
-from zExceptions import ResourceLockedError
-from zExceptions.TracebackSupplement import PathTracebackSupplement
-from zope.contenttype import guess_content_type
 from ZPublisher.HTTPRequest import default_encoding
 from ZPublisher.Iterators import IStreamIterator
 

src/OFS/FindSupport.py

@@ -19,15 +19,16 @@
 from AccessControl.tainted import TaintedString
 from Acquisition import aq_base
 from Acquisition import aq_parent
-from App.special_dtml import DTMLFile
 from DateTime.DateTime import DateTime
 from DocumentTemplate._DocumentTemplate import InstanceDict
 from DocumentTemplate._DocumentTemplate import TemplateDict
 from DocumentTemplate.DT_Util import Eval
 from DocumentTemplate.security import RestrictedDTML
 from ExtensionClass import Base
-from OFS.interfaces import IFindSupport
 from zope.interface import implementer
+
+from App.special_dtml import DTMLFile
+from OFS.interfaces import IFindSupport
 from ZPublisher.HTTPRequest import default_encoding
 
 

src/OFS/Folder.py

@@ -16,6 +16,8 @@
 """
 
 from AccessControl.class_init import InitializeClass
+from zope.interface import implementer
+
 from App.special_dtml import DTMLFile
 from OFS.FindSupport import FindSupport
 from OFS.interfaces import IFolder
@@ -26,7 +28,6 @@
 from OFS.SimpleItem import Item
 from OFS.SimpleItem import PathReprProvider
 from webdav.Collection import Collection
-from zope.interface import implementer
 
 
 manage_addFolderForm = DTMLFile('dtml/folderAdd', globals())

src/OFS/History.py

@@ -22,11 +22,12 @@
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import Implicit
 from Acquisition import aq_base
-from App.special_dtml import DTMLFile
 from DateTime.DateTime import DateTime
 from ExtensionClass import Base
 from zExceptions import Redirect
 
+from App.special_dtml import DTMLFile
+
 
 view_history = 'View History'