Sort imports, use src-layout.

CHANGES.rst

@@ -5,7 +5,7 @@
 3.6.1 (unreleased)
 ==================
 
-- Nothing yet.
+- Drop support for Python 3.4.
 
 
 3.6.0 (2021-05-19)

setup.py

@@ -42,6 +42,7 @@
         "ZConfig.tests.library.thing",
         "ZConfig.tests.library.widget",
         ],
+    package_dir={'': 'src'},
     entry_points={
         'console_scripts': [
             'zconfig = ZConfig.validator:main',
@@ -63,7 +64,6 @@
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',

src/ZConfig/__init__.py

@@ -33,8 +33,9 @@
 """
 __docformat__ = "reStructuredText"
 
-from ZConfig._compat import TextIO
 import ZConfig.loader
+from ZConfig._compat import TextIO
+
 
 loadConfigFile = ZConfig.loader.loadConfigFile
 loadSchemaFile = ZConfig.loader.loadSchemaFile

src/ZConfig/_compat.py

@@ -12,10 +12,10 @@
 #
 ##############################################################################
 
-from io import StringIO
-from io import BytesIO
 import abc
 import sys
+from io import BytesIO
+from io import StringIO
 
 
 PY3 = sys.version_info[0] >= 3

src/ZConfig/_schema_utils.py

@@ -13,30 +13,29 @@
 ##############################################################################
 from __future__ import print_function
 
-from abc import abstractmethod
 import argparse
 import itertools
 import sys
 import textwrap
+from abc import abstractmethod
+
 
 try:
-    from itertools import ifilterfalse
     from itertools import ifilter
+    from itertools import ifilterfalse
 except ImportError:
     # Py3
     from itertools import filterfalse as ifilterfalse
     ifilter = filter
 
 import ZConfig.loader
-
 from ZConfig._compat import AbstractBaseClass
-
 from ZConfig.datatypes import null_conversion
-from ZConfig.info import SectionType
+from ZConfig.info import AbstractType
+from ZConfig.info import MultiKeyInfo
 from ZConfig.info import SectionInfo
+from ZConfig.info import SectionType
 from ZConfig.info import ValueInfo
-from ZConfig.info import MultiKeyInfo
-from ZConfig.info import AbstractType
 
 
 MARKER = object()

src/ZConfig/cfgparser.py

@@ -17,9 +17,9 @@
 
 import ZConfig
 import ZConfig.url
-
-from ZConfig.substitution import isname, substitute
 from ZConfig._compat import raise_with_same_tb
+from ZConfig.substitution import isname
+from ZConfig.substitution import substitute
 
 
 # _name_re does not allow "(" or ")" for historical reasons.  Though

src/ZConfig/cmdline.py

@@ -28,7 +28,6 @@ class from the :mod:`ZConfig.loader` module. This provides support for
 import ZConfig
 import ZConfig.loader
 import ZConfig.matcher
-
 from ZConfig._compat import raise_with_same_tb
 
 

src/ZConfig/components/basic/tests/test_mapping.py

@@ -16,9 +16,10 @@
 ZConfig.components.basic.
 """
 
-import ZConfig.tests.support
 import unittest
 
+import ZConfig.tests.support
+
 
 SIMPLE_SCHEMA = '''\
 <schema>

src/ZConfig/components/logger/handlers.py

@@ -13,14 +13,13 @@
 ##############################################################################
 """ZConfig factory datatypes for log handlers."""
 
-from abc import abstractmethod
 import functools
 import sys
+from abc import abstractmethod
 
+import ZConfig.components.logger.formatter
 from ZConfig._compat import urlparse
-
 from ZConfig.components.logger.factory import Factory
-import ZConfig.components.logger.formatter
 
 
 _log_format_variables = (

src/ZConfig/components/logger/tests/support.py

@@ -20,10 +20,10 @@
 import os
 import tempfile
 
-from ZConfig.components.logger import loghandler
-import ZConfig._compat
 import ZConfig
+import ZConfig._compat
 import ZConfig.tests.support
+from ZConfig.components.logger import loghandler
 
 
 class LoggingTestHelper(ZConfig.tests.support.TestHelper):

src/ZConfig/components/logger/tests/test_logger.py

@@ -21,17 +21,14 @@
 import unittest
 
 import ZConfig
-
+import ZConfig.components.logger.tests.support
+import ZConfig.tests.support
+from ZConfig._compat import NStringIO as StringIO
+from ZConfig._compat import maxsize
 from ZConfig.components.logger import datatypes
 from ZConfig.components.logger import handlers
 from ZConfig.components.logger import loghandler
 
-from ZConfig._compat import NStringIO as StringIO
-from ZConfig._compat import maxsize
-
-import ZConfig.tests.support
-import ZConfig.components.logger.tests.support
-
 
 class CustomFormatter(logging.Formatter):
     def formatException(self, ei):

src/ZConfig/datatypes.py

@@ -30,12 +30,15 @@
 
 """
 
+import datetime
 import os
 import re
 import sys
-import datetime
 
-from ZConfig._compat import have_unicode, text_type, PY3
+from ZConfig._compat import PY3
+from ZConfig._compat import have_unicode
+from ZConfig._compat import text_type
+
 
 if PY3:
     from functools import reduce

src/ZConfig/info.py

@@ -14,12 +14,11 @@
 """Objects that can describe a ZConfig schema."""
 
 import copy
-import ZConfig
-
 from abc import abstractmethod
 from collections import OrderedDict
 from functools import total_ordering
 
+import ZConfig
 from ZConfig._compat import AbstractBaseClass
 
 

src/ZConfig/loader.py

@@ -16,7 +16,6 @@
 import os.path
 import re
 import sys
-
 from abc import abstractmethod
 from io import StringIO
 
@@ -27,12 +26,11 @@
 import ZConfig.matcher
 import ZConfig.schema
 import ZConfig.url
-
-from ZConfig._compat import reraise
-from ZConfig._compat import raise_with_same_tb
-from ZConfig._compat import urllib2
 from ZConfig._compat import AbstractBaseClass
 from ZConfig._compat import pathname2url
+from ZConfig._compat import raise_with_same_tb
+from ZConfig._compat import reraise
+from ZConfig._compat import urllib2
 
 
 def loadSchema(url):

src/ZConfig/matcher.py

@@ -14,9 +14,8 @@
 """Utility that manages the binding of configuration data to a section."""
 
 import ZConfig
-
-from ZConfig.info import ValueInfo
 from ZConfig._compat import raise_with_same_tb
+from ZConfig.info import ValueInfo
 
 
 class BaseMatcher(object):

src/ZConfig/pygments.py

@@ -16,7 +16,8 @@
 
 """
 
-from __future__ import print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import print_function
 
 import pygments.lexer
 import pygments.token

src/ZConfig/schema.py

@@ -18,12 +18,11 @@
 import xml.sax
 
 import ZConfig
-
 from ZConfig import info
 from ZConfig import url
-
 from ZConfig._compat import raise_with_same_tb
 
+
 BLANK = u''
 
 

src/ZConfig/schema2html.py

@@ -14,16 +14,19 @@
 
 import argparse
 from contextlib import contextmanager
+
+
 try:
     import html
 except ImportError:
     # Py2
     import cgi as html
+
 import sys
 
-from ZConfig._schema_utils import AbstractSchemaPrinter
-from ZConfig._schema_utils import AbstractSchemaFormatter
 from ZConfig._schema_utils import MARKER
+from ZConfig._schema_utils import AbstractSchemaFormatter
+from ZConfig._schema_utils import AbstractSchemaPrinter
 from ZConfig._schema_utils import load_schema
 from ZConfig.sphinx import RstSchemaPrinter
 

src/ZConfig/sphinx.py

@@ -11,27 +11,28 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-from __future__ import print_function, absolute_import
-
+from __future__ import absolute_import
+from __future__ import print_function
 
 from contextlib import contextmanager
 
+
 try:
-    from docutils import nodes
-    import docutils.utils
     import docutils.frontend
     import docutils.parsers.rst
+    import docutils.utils
+    from docutils import nodes
     from docutils.parsers.rst import Directive
 except ImportError:  # pragma: no cover
     RstSchemaPrinter = None
     RstSchemaFormatter = None
 else:
 
     from ZConfig._compat import string_types
-    from ZConfig._schema_utils import load_schema
+    from ZConfig._schema_utils import MARKER
     from ZConfig._schema_utils import AbstractSchemaFormatter
     from ZConfig._schema_utils import AbstractSchemaPrinter
-    from ZConfig._schema_utils import MARKER
+    from ZConfig._schema_utils import load_schema
 
     class RstSchemaFormatter(AbstractSchemaFormatter):
 

src/ZConfig/tests/library/thing/__init__.py

@@ -18,5 +18,6 @@
 
 import os
 
+
 here = os.path.dirname(__file__)
 __path__.append(os.path.join(here, "extras"))

src/ZConfig/tests/support.py

@@ -20,12 +20,11 @@
 import unittest
 
 import ZConfig
-
+from ZConfig._compat import NStringIO as StringIO
+from ZConfig._compat import pathname2url
 from ZConfig.loader import ConfigLoader
 from ZConfig.url import urljoin
 
-from ZConfig._compat import NStringIO as StringIO
-from ZConfig._compat import pathname2url
 
 INPUT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "input"))
 CONFIG_BASE = "file://%s/" % pathname2url(INPUT_DIR)

src/ZConfig/tests/test_cfgimports.py

@@ -18,7 +18,6 @@
 
 import ZConfig
 import ZConfig.tests.support
-
 from ZConfig._compat import NStringIO as StringIO
 
 

src/ZConfig/tests/test_cmdline.py

@@ -18,7 +18,6 @@
 
 import ZConfig
 import ZConfig.tests.support
-
 from ZConfig.cmdline import ExtendedConfigLoader
 
 

src/ZConfig/tests/test_config.py

@@ -17,12 +17,10 @@
 import unittest
 
 import ZConfig
-
+from ZConfig._compat import NStringIO as StringIO
 from ZConfig.tests.support import CONFIG_BASE
 from ZConfig.tests.support import TestHelper
 
-from ZConfig._compat import NStringIO as StringIO
-
 
 class ConfigurationTestCase(TestHelper, unittest.TestCase):
 

src/ZConfig/tests/test_cookbook.py

@@ -20,9 +20,10 @@
 
 """
 
-import ZConfig.tests.support
 import unittest
 
+import ZConfig.tests.support
+
 
 def basic_key_mapping_password_to_passwd(key):
     # Lower-case the key since that's what basic-key does: