Skip to content

Commit b9a3469

Browse files
dataflakedataflake
authored
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
1 parent b4495eb commit b9a3469

File tree

205 files changed

+820
-690
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+820
-690
lines changed

‎.travis.yml

-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ matrix:
1616
- python: "3.8-dev"
1717
env: TOXENV=py38
1818
dist: xenial
19-
allow_failures:
20-
- python: "3.6"
21-
env: TOXENV=lint-py36
2219

2320
install:
2421
- travis_retry pip install -U pip setuptools

‎CHANGES.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Features
2020

2121
Other changes
2222
+++++++++++++
23-
- full PEP-8 compliance with the exception of import sorting
23+
- full PEP-8 compliance
2424

2525

2626
4.0b10 (2019-03-08)

‎setup.cfg

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@ ignore =
1111
.travis.yml
1212

1313
[isort]
14-
force_alphabetical_sort = True
1514
force_single_line = True
16-
17-
line_length = 200
15+
combine_as_imports = True
16+
sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER
17+
known_third_party = ipaddress, PasteDeploy, six, waitress, chameleon
18+
known_zope = AccessControl, Acquisition, DateTime, DocumentTemplate, ExtensionClass, MultiMapping, Persistence, persistent, RestrictedPython, Testing, transaction, ZConfig, zExceptions, ZODB, zope, Zope2
19+
default_section = ZOPE
20+
line_length = 79
1821
lines_after_imports = 2
19-
2022
not_skip =
2123
__init__.py
2224

‎setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
#
1313
##############################################################################
1414

15+
import os
16+
1517
from setuptools import find_packages
1618
from setuptools import setup
1719

18-
import os
19-
2020

2121
HERE = os.path.abspath(os.path.dirname(__file__))
2222

‎src/App/ApplicationManager.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
import os
1515
import sys
1616

17+
from six.moves.urllib import parse
18+
1719
from AccessControl.class_init import InitializeClass
1820
from AccessControl.requestmethod import requestmethod
1921
from Acquisition import Implicit
20-
from six.moves.urllib import parse
21-
2222
from App.config import getConfiguration
2323
from App.Management import Tabs
2424
from App.special_dtml import DTMLFile

‎src/App/Common.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
import os
1616
import sys
1717
import time
18-
19-
from Acquisition import aq_base, aq_parent
20-
2118
# BBB
2219
from os.path import realpath # NOQA
20+
21+
from Acquisition import aq_base
22+
from Acquisition import aq_parent
23+
24+
2325
attrget = getattr
2426

2527
# These are needed because the various date formats below must

‎src/App/Dialogs.py

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
from App.special_dtml import HTML
3535

36+
3637
MessageDialog = HTML("""
3738
<HTML>
3839
<HEAD>

‎src/App/Extensions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
1515
Extensions currently include external methods.
1616
"""
17-
from functools import total_ordering
1817
import os
18+
from functools import total_ordering
1919

2020
from six import exec_
2121

‎src/App/FactoryDispatcher.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@
1818

1919
from AccessControl.class_init import InitializeClass
2020
from AccessControl.owner import UnownableOwner
21-
from AccessControl.SecurityInfo import ClassSecurityInfo
2221
from AccessControl.PermissionMapping import aqwrap
22+
from AccessControl.SecurityInfo import ClassSecurityInfo
2323
from Acquisition import Acquired
24-
from Acquisition import aq_base
2524
from Acquisition import Implicit
25+
from Acquisition import aq_base
2626
from ExtensionClass import Base
27-
2827
from OFS.metaconfigure import get_registered_packages
2928

3029

‎src/App/FindHomes.py

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
import os
1515

16+
1617
try:
1718
chome = os.environ['INSTANCE_HOME']
1819
except KeyError:

‎src/App/ImageFile.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import time
1818
import warnings
1919

20+
import Zope2
2021
from AccessControl.class_init import InitializeClass
2122
from AccessControl.SecurityInfo import ClassSecurityInfo
2223
from Acquisition import Explicit
@@ -28,7 +29,7 @@
2829
from zope.contenttype import guess_content_type
2930
from ZPublisher.Iterators import filestream_iterator
3031

31-
import Zope2
32+
3233
PREFIX = os.path.realpath(
3334
os.path.join(os.path.dirname(Zope2.__file__), os.path.pardir))
3435

‎src/App/Management.py

+10-6
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,24 @@
1313
"""Standard management interface support
1414
"""
1515

16-
from AccessControl import Unauthorized
16+
import itertools
17+
18+
import six
19+
from six.moves.urllib.parse import quote
20+
from six.moves.urllib.parse import unquote
21+
22+
import zope.event
1723
from AccessControl import ClassSecurityInfo
24+
from AccessControl import Unauthorized
1825
from AccessControl.class_init import InitializeClass
1926
from AccessControl.Permissions import view_management_screens
20-
from App.interfaces import INavigation
2127
from App.interfaces import ICSSPaths
2228
from App.interfaces import IJSPaths
29+
from App.interfaces import INavigation
2330
from App.special_dtml import DTMLFile
2431
from ExtensionClass import Base
25-
from six.moves.urllib.parse import quote, unquote
2632
from zope.interface import implementer
27-
import itertools
28-
import six
29-
import zope.event
33+
3034

3135
try:
3236
from html import escape

‎src/App/ProductContext.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,19 @@
1313
"""Objects providing context for product initialization
1414
"""
1515

16-
from logging import getLogger
1716
import os
1817
import sys
18+
from logging import getLogger
1919

20+
# Waaaa
21+
import Products
2022
from AccessControl.Permission import registerPermissions
2123
from AccessControl.PermissionRole import PermissionRole
24+
from App.FactoryDispatcher import FactoryDispatcher
2225
from OFS.ObjectManager import ObjectManager
23-
2426
from zope.interface import implementedBy
2527

26-
from App.FactoryDispatcher import FactoryDispatcher
2728

28-
# Waaaa
29-
import Products
3029
if not hasattr(Products, 'meta_types'):
3130
Products.meta_types = ()
3231
if not hasattr(Products, 'meta_classes'):

‎src/App/Undo.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515

1616
import binascii
1717

18-
from Acquisition import Implicit
18+
import transaction
1919
from AccessControl import ClassSecurityInfo
2020
from AccessControl.class_init import InitializeClass
2121
from AccessControl.Permissions import undo_changes
22-
from DateTime.DateTime import DateTime
23-
import transaction
24-
22+
from Acquisition import Implicit
2523
from App.Management import Tabs
2624
from App.special_dtml import DTMLFile
25+
from DateTime.DateTime import DateTime
2726

2827

2928
class UndoSupport(Tabs, Implicit):

‎src/App/ZApplication.py

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import sys
2121

22+
2223
if sys.version_info >= (3, ):
2324
basestring = str
2425

‎src/App/bbb.py

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
import pkg_resources
1515

16+
1617
HAS_ZSERVER = True
1718
try:
1819
dist = pkg_resources.get_distribution('ZServer')

‎src/App/class_init.py

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
from zope.deferredimport import deprecated
1717

18+
1819
# BBB Zope 5.0
1920
deprecated(
2021
'Please import from AccessControl.Permission.',

‎src/App/config.py

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import os
1616

17+
1718
_config = None
1819

1920

‎src/App/special_dtml.py

+13-7
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,22 @@
1717
import DocumentTemplate
1818
import MethodObject
1919
import Persistence
20-
from App import Common
21-
from App.config import getConfiguration
2220
import Zope2
23-
24-
from Shared.DC.Scripts.Bindings import Bindings
25-
from Acquisition import Explicit, aq_inner, aq_parent, aq_acquire
26-
from DocumentTemplate.DT_String import _marker, DTReturn, render_blocks
27-
from DocumentTemplate.DT_Util import TemplateDict, InstanceDict
2821
from AccessControl import getSecurityManager
22+
from Acquisition import Explicit
23+
from Acquisition import aq_acquire
24+
from Acquisition import aq_inner
25+
from Acquisition import aq_parent
26+
from App import Common
27+
from App.config import getConfiguration
2928
from ComputedAttribute import ComputedAttribute
29+
from DocumentTemplate.DT_String import DTReturn
30+
from DocumentTemplate.DT_String import _marker
31+
from DocumentTemplate.DT_String import render_blocks
32+
from DocumentTemplate.DT_Util import InstanceDict
33+
from DocumentTemplate.DT_Util import TemplateDict
34+
from Shared.DC.Scripts.Bindings import Bindings
35+
3036

3137
LOG = getLogger('special_dtml')
3238

‎src/App/tests/testImageFile.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import io
22
import os.path
3-
from io import BytesIO
43
import unittest
4+
from io import BytesIO
55

66
import App
77
from Testing.ZopeTestCase.warnhook import WarningsHook

‎src/App/tests/test_ApplicationManager.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import Testing.ZopeTestCase
21
import os
32
import shutil
43
import sys
54
import tempfile
65
import unittest
76

7+
import Testing.ZopeTestCase
8+
89

910
class DummyConnection(object):
1011

‎src/App/tests/test_class_init.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
import unittest
1818

19-
from AccessControl.class_init import InitializeClass
2019
import ExtensionClass
20+
from AccessControl.class_init import InitializeClass
2121

2222

2323
class TestInitializeClass(unittest.TestCase):

‎src/App/tests/test_getZopeVersion.py

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import unittest
1717

1818
from pkg_resources import get_distribution
19+
1920
from App.version_txt import getZopeVersion
2021

2122

‎src/App/version_txt.py

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import pkg_resources
1818

19+
1920
_version_string = None
2021
_zope_version = None
2122

‎src/OFS/Application.py

+10-9
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313
"""Application support
1414
"""
1515

16-
from . import Folder
17-
from . import misc_
18-
from .interfaces import IApplication
19-
from .misc_ import Misc_
16+
import os
17+
import sys
18+
from logging import getLogger
19+
20+
import Products
21+
import transaction
2022
from AccessControl import ClassSecurityInfo
2123
from AccessControl.class_init import InitializeClass
2224
from AccessControl.Permission import ApplicationDefaultPermissions
@@ -25,7 +27,6 @@
2527
from App.ApplicationManager import ApplicationManager
2628
from App.ProductContext import ProductContext
2729
from DateTime import DateTime
28-
from logging import getLogger
2930
from OFS import bbb
3031
from OFS.FindSupport import FindSupport
3132
from OFS.metaconfigure import get_packages_to_initialize
@@ -35,10 +36,10 @@
3536
from zExceptions import Redirect as RedirectException
3637
from zope.interface import implementer
3738

38-
import os
39-
import Products
40-
import sys
41-
import transaction
39+
from . import Folder
40+
from . import misc_
41+
from .interfaces import IApplication
42+
from .misc_ import Misc_
4243

4344

4445
if bbb.HAS_ZSERVER:

‎src/OFS/Cache.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
"""Cacheable object and cache management base classes.
1414
"""
1515

16+
import sys
17+
import time
18+
from logging import getLogger
19+
1620
from AccessControl.class_init import InitializeClass
1721
from AccessControl.Permissions import view_management_screens
1822
from AccessControl.SecurityInfo import ClassSecurityInfo
@@ -24,10 +28,6 @@
2428
from Acquisition import aq_inner
2529
from Acquisition import aq_parent
2630
from App.special_dtml import DTMLFile
27-
from logging import getLogger
28-
29-
import sys
30-
import time
3131

3232

3333
ZCM_MANAGERS = '__ZCacheManager_ids__'

0 commit comments

Comments
 (0)