Fixed import sorting (#529)

* - import sort first attempt * - add more zope section libraries * - next round * - now lint-py36 and isort-apply agree * - after-merge cleanup * - more merge cleanup * - add more flake8 test exclusions where needed * - linting failures no longer allowed
zopefoundation · Mar 27, 2019 · b9a3469 · b9a3469
1 parent b4495eb
commit b9a3469
Show file tree

Hide file tree

Showing 205 changed files with 820 additions and 690 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,9 +16,6 @@ matrix:
         - python: "3.8-dev"
           env: TOXENV=py38
           dist: xenial
-    allow_failures:
-        - python: "3.6"
-          env: TOXENV=lint-py36
 
 install:
     - travis_retry pip install -U pip setuptools

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -20,7 +20,7 @@ Features
 
 Other changes
 +++++++++++++
-- full PEP-8 compliance with the exception of import sorting
+- full PEP-8 compliance
 
 
 4.0b10 (2019-03-08)

diff --git a/setup.cfg b/setup.cfg
@@ -11,12 +11,14 @@ ignore =
     .travis.yml
 
 [isort]
-force_alphabetical_sort = True
 force_single_line = True
-
-line_length = 200
+combine_as_imports = True
+sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER
+known_third_party = ipaddress, PasteDeploy, six, waitress, chameleon
+known_zope = AccessControl, Acquisition, DateTime, DocumentTemplate, ExtensionClass, MultiMapping, Persistence, persistent, RestrictedPython, Testing, transaction, ZConfig, zExceptions, ZODB, zope, Zope2
+default_section = ZOPE
+line_length = 79
 lines_after_imports = 2
-
 not_skip =
     __init__.py
 

diff --git a/setup.py b/setup.py
@@ -12,11 +12,11 @@
 #
 ##############################################################################
 
+import os
+
 from setuptools import find_packages
 from setuptools import setup
 
-import os
-
 
 HERE = os.path.abspath(os.path.dirname(__file__))
 

diff --git a/src/App/ApplicationManager.py b/src/App/ApplicationManager.py
@@ -14,11 +14,11 @@
 import os
 import sys
 
+from six.moves.urllib import parse
+
 from AccessControl.class_init import InitializeClass
 from AccessControl.requestmethod import requestmethod
 from Acquisition import Implicit
-from six.moves.urllib import parse
-
 from App.config import getConfiguration
 from App.Management import Tabs
 from App.special_dtml import DTMLFile

diff --git a/src/App/Common.py b/src/App/Common.py
@@ -15,11 +15,13 @@
 import os
 import sys
 import time
-
-from Acquisition import aq_base, aq_parent
-
 # BBB
 from os.path import realpath  # NOQA
+
+from Acquisition import aq_base
+from Acquisition import aq_parent
+
+
 attrget = getattr
 
 # These are needed because the various date formats below must

diff --git a/src/App/Dialogs.py b/src/App/Dialogs.py
@@ -33,6 +33,7 @@
 
 from App.special_dtml import HTML
 
+
 MessageDialog = HTML("""
 <HTML>
 <HEAD>

diff --git a/src/App/Extensions.py b/src/App/Extensions.py
@@ -14,8 +14,8 @@
 
 Extensions currently include external methods.
 """
-from functools import total_ordering
 import os
+from functools import total_ordering
 
 from six import exec_
 

diff --git a/src/App/FactoryDispatcher.py b/src/App/FactoryDispatcher.py
@@ -18,13 +18,12 @@
 
 from AccessControl.class_init import InitializeClass
 from AccessControl.owner import UnownableOwner
-from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.PermissionMapping import aqwrap
+from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import Acquired
-from Acquisition import aq_base
 from Acquisition import Implicit
+from Acquisition import aq_base
 from ExtensionClass import Base
-
 from OFS.metaconfigure import get_registered_packages
 
 

diff --git a/src/App/FindHomes.py b/src/App/FindHomes.py
@@ -13,6 +13,7 @@
 
 import os
 
+
 try:
     chome = os.environ['INSTANCE_HOME']
 except KeyError:

diff --git a/src/App/ImageFile.py b/src/App/ImageFile.py
@@ -17,6 +17,7 @@
 import time
 import warnings
 
+import Zope2
 from AccessControl.class_init import InitializeClass
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import Explicit
@@ -28,7 +29,7 @@
 from zope.contenttype import guess_content_type
 from ZPublisher.Iterators import filestream_iterator
 
-import Zope2
+
 PREFIX = os.path.realpath(
     os.path.join(os.path.dirname(Zope2.__file__), os.path.pardir))
 

diff --git a/src/App/Management.py b/src/App/Management.py
@@ -13,20 +13,24 @@
 """Standard management interface support
 """
 
-from AccessControl import Unauthorized
+import itertools
+
+import six
+from six.moves.urllib.parse import quote
+from six.moves.urllib.parse import unquote
+
+import zope.event
 from AccessControl import ClassSecurityInfo
+from AccessControl import Unauthorized
 from AccessControl.class_init import InitializeClass
 from AccessControl.Permissions import view_management_screens
-from App.interfaces import INavigation
 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 six.moves.urllib.parse import quote, unquote
 from zope.interface import implementer
-import itertools
-import six
-import zope.event
+
 
 try:
     from html import escape

diff --git a/src/App/ProductContext.py b/src/App/ProductContext.py
@@ -13,20 +13,19 @@
 """Objects providing context for product initialization
 """
 
-from logging import getLogger
 import os
 import sys
+from logging import getLogger
 
+# Waaaa
+import Products
 from AccessControl.Permission import registerPermissions
 from AccessControl.PermissionRole import PermissionRole
+from App.FactoryDispatcher import FactoryDispatcher
 from OFS.ObjectManager import ObjectManager
-
 from zope.interface import implementedBy
 
-from App.FactoryDispatcher import FactoryDispatcher
 
-# Waaaa
-import Products
 if not hasattr(Products, 'meta_types'):
     Products.meta_types = ()
 if not hasattr(Products, 'meta_classes'):

diff --git a/src/App/Undo.py b/src/App/Undo.py
@@ -15,15 +15,14 @@
 
 import binascii
 
-from Acquisition import Implicit
+import transaction
 from AccessControl import ClassSecurityInfo
 from AccessControl.class_init import InitializeClass
 from AccessControl.Permissions import undo_changes
-from DateTime.DateTime import DateTime
-import transaction
-
+from Acquisition import Implicit
 from App.Management import Tabs
 from App.special_dtml import DTMLFile
+from DateTime.DateTime import DateTime
 
 
 class UndoSupport(Tabs, Implicit):

diff --git a/src/App/ZApplication.py b/src/App/ZApplication.py
@@ -19,6 +19,7 @@
 
 import sys
 
+
 if sys.version_info >= (3, ):
     basestring = str
 

diff --git a/src/App/bbb.py b/src/App/bbb.py
@@ -13,6 +13,7 @@
 
 import pkg_resources
 
+
 HAS_ZSERVER = True
 try:
     dist = pkg_resources.get_distribution('ZServer')

diff --git a/src/App/class_init.py b/src/App/class_init.py
@@ -15,6 +15,7 @@
 
 from zope.deferredimport import deprecated
 
+
 # BBB Zope 5.0
 deprecated(
     'Please import from AccessControl.Permission.',

diff --git a/src/App/config.py b/src/App/config.py
@@ -14,6 +14,7 @@
 
 import os
 
+
 _config = None
 
 

diff --git a/src/App/special_dtml.py b/src/App/special_dtml.py
@@ -17,16 +17,22 @@
 import DocumentTemplate
 import MethodObject
 import Persistence
-from App import Common
-from App.config import getConfiguration
 import Zope2
-
-from Shared.DC.Scripts.Bindings import Bindings
-from Acquisition import Explicit, aq_inner, aq_parent, aq_acquire
-from DocumentTemplate.DT_String import _marker, DTReturn, render_blocks
-from DocumentTemplate.DT_Util import TemplateDict, InstanceDict
 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.DT_String import DTReturn
+from DocumentTemplate.DT_String import _marker
+from DocumentTemplate.DT_String import render_blocks
+from DocumentTemplate.DT_Util import InstanceDict
+from DocumentTemplate.DT_Util import TemplateDict
+from Shared.DC.Scripts.Bindings import Bindings
+
 
 LOG = getLogger('special_dtml')
 

diff --git a/src/App/tests/testImageFile.py b/src/App/tests/testImageFile.py
@@ -1,7 +1,7 @@
 import io
 import os.path
-from io import BytesIO
 import unittest
+from io import BytesIO
 
 import App
 from Testing.ZopeTestCase.warnhook import WarningsHook

diff --git a/src/App/tests/test_ApplicationManager.py b/src/App/tests/test_ApplicationManager.py
@@ -1,10 +1,11 @@
-import Testing.ZopeTestCase
 import os
 import shutil
 import sys
 import tempfile
 import unittest
 
+import Testing.ZopeTestCase
+
 
 class DummyConnection(object):
 

diff --git a/src/App/tests/test_class_init.py b/src/App/tests/test_class_init.py
@@ -16,8 +16,8 @@
 
 import unittest
 
-from AccessControl.class_init import InitializeClass
 import ExtensionClass
+from AccessControl.class_init import InitializeClass
 
 
 class TestInitializeClass(unittest.TestCase):

diff --git a/src/App/tests/test_getZopeVersion.py b/src/App/tests/test_getZopeVersion.py
@@ -16,6 +16,7 @@
 import unittest
 
 from pkg_resources import get_distribution
+
 from App.version_txt import getZopeVersion
 
 

diff --git a/src/App/version_txt.py b/src/App/version_txt.py
@@ -16,6 +16,7 @@
 
 import pkg_resources
 
+
 _version_string = None
 _zope_version = None
 

diff --git a/src/OFS/Application.py b/src/OFS/Application.py
@@ -13,10 +13,12 @@
 """Application support
 """
 
-from . import Folder
-from . import misc_
-from .interfaces import IApplication
-from .misc_ import Misc_
+import os
+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
@@ -25,7 +27,6 @@
 from App.ApplicationManager import ApplicationManager
 from App.ProductContext import ProductContext
 from DateTime import DateTime
-from logging import getLogger
 from OFS import bbb
 from OFS.FindSupport import FindSupport
 from OFS.metaconfigure import get_packages_to_initialize
@@ -35,10 +36,10 @@
 from zExceptions import Redirect as RedirectException
 from zope.interface import implementer
 
-import os
-import Products
-import sys
-import transaction
+from . import Folder
+from . import misc_
+from .interfaces import IApplication
+from .misc_ import Misc_
 
 
 if bbb.HAS_ZSERVER:

diff --git a/src/OFS/Cache.py b/src/OFS/Cache.py
@@ -13,6 +13,10 @@
 """Cacheable object and cache management base classes.
 """
 
+import sys
+import time
+from logging import getLogger
+
 from AccessControl.class_init import InitializeClass
 from AccessControl.Permissions import view_management_screens
 from AccessControl.SecurityInfo import ClassSecurityInfo
@@ -24,10 +28,6 @@
 from Acquisition import aq_inner
 from Acquisition import aq_parent
 from App.special_dtml import DTMLFile
-from logging import getLogger
-
-import sys
-import time
 
 
 ZCM_MANAGERS = '__ZCacheManager_ids__'
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,7 @@ @@
     from App.special_dtml import HTML
     MessageDialog = HTML("""
     <HTML>
     <HEAD>
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,6 +19,7 @@

		import sys


		if sys.version_info >= (3, ):
		basestring = str

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,6 +14,7 @@

		import os


		_config = None


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,6 +16,7 @@
		import unittest

		from pkg_resources import get_distribution

		from App.version_txt import getZopeVersion


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,6 +16,7 @@

		import pkg_resources


		_version_string = None
		_zope_version = None

Expand Down