]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Automatically sort imports in Python code
authorŠtěpán Balážik <stepan@isc.org>
Sat, 21 Feb 2026 12:46:34 +0000 (13:46 +0100)
committerŠtěpán Balážik <stepan@isc.org>
Wed, 25 Feb 2026 12:33:20 +0000 (13:33 +0100)
Generated with: ruff check --extend-select I --fix (with the changes to
pyproject.toml applied).

(cherry picked from commit ffd5b6ac262e8838dfc10790c6a67f545405a594)

118 files changed:
bin/tests/convert_trs_to_junit.py
bin/tests/system/ans.py
bin/tests/system/bailiwick/ans1/ans.py
bin/tests/system/bailiwick/ans2/ans.py
bin/tests/system/bailiwick/tests_bailiwick.py
bin/tests/system/checkds/tests_checkds.py
bin/tests/system/cipher-suites/tests_cipher_suites.py
bin/tests/system/conftest.py
bin/tests/system/convert_junit_to_trs.py
bin/tests/system/cookie/cookie_ans.py
bin/tests/system/digdelv/ans4/ans.py
bin/tests/system/digdelv/ans5/ans.py
bin/tests/system/digdelv/ans6/ans.py
bin/tests/system/dispatch/tests_connreset.py
bin/tests/system/dnssec-malformed-dnskey/tests_malformed_dnskey.py
bin/tests/system/dnstap/tests_dnstap.py
bin/tests/system/dnstap/ydump.py
bin/tests/system/doth/conftest.py
bin/tests/system/doth/stress_http_quota.py
bin/tests/system/doth/tests_gnutls.py
bin/tests/system/ecdsa/tests_ecdsa.py
bin/tests/system/filters/common.py
bin/tests/system/filters/tests_filter_a_v4.py
bin/tests/system/filters/tests_filter_a_v6.py
bin/tests/system/filters/tests_filter_aaaa_v4.py
bin/tests/system/filters/tests_filter_aaaa_v6.py
bin/tests/system/filters/tests_filter_checkconf.py
bin/tests/system/filters/tests_filter_dns64.py
bin/tests/system/isctest/__init__.py
bin/tests/system/isctest/asyncserver.py
bin/tests/system/isctest/check.py
bin/tests/system/isctest/hypothesis/__init__.py
bin/tests/system/isctest/hypothesis/strategies.py
bin/tests/system/isctest/instance.py
bin/tests/system/isctest/kasp.py
bin/tests/system/isctest/log/__init__.py
bin/tests/system/isctest/log/basic.py
bin/tests/system/isctest/log/watchlog.py
bin/tests/system/isctest/mark.py
bin/tests/system/isctest/name.py
bin/tests/system/isctest/query.py
bin/tests/system/isctest/run.py
bin/tests/system/isctest/text.py
bin/tests/system/isctest/vars/__init__.py
bin/tests/system/isctest/vars/algorithms.py
bin/tests/system/isctest/vars/all.py
bin/tests/system/isctest/vars/basic.py
bin/tests/system/isctest/vars/dirs.py
bin/tests/system/isctest/vars/openssl.py
bin/tests/system/ixfr-nonminimal/ans2/ans.py
bin/tests/system/ixfr-nonminimal/ans4/ans.py
bin/tests/system/kasp/tests_kasp.py
bin/tests/system/keepalive/tests_keepalive.py
bin/tests/system/keyfromlabel/tests_keyfromlabel.py
bin/tests/system/ksr/tests_ksr.py
bin/tests/system/limits/tests_limits.py
bin/tests/system/migrate2kasp/tests_migrate2kasp.py
bin/tests/system/multisigner/tests_multisigner.py
bin/tests/system/nsec3-answer/tests_nsec3.py
bin/tests/system/nsec3/common.py
bin/tests/system/nsec3/tests_nsec3_change.py
bin/tests/system/nsec3/tests_nsec3_initial.py
bin/tests/system/nsec3/tests_nsec3_reconfig.py
bin/tests/system/nsec3/tests_nsec3_reload.py
bin/tests/system/nsec3/tests_nsec3_restart.py
bin/tests/system/nsec3/tests_nsec3_retransfer.py
bin/tests/system/nsupdate/ans4/ans.py
bin/tests/system/nzd2nzf/tests_nzd2nzf.py
bin/tests/system/optout/tests_optout.py
bin/tests/system/re_compile_checker.py
bin/tests/system/resolver/ans2/ans.py
bin/tests/system/resolver/ans3/ans.py
bin/tests/system/resolver/ans8/ans.py
bin/tests/system/rfc5011/tests_rfc5011.py
bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_initial.py
bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_reconfig.py
bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_initial.py
bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_reconfig.py
bin/tests/system/rollover-csk-roll1/tests_rollover_csk_roll1.py
bin/tests/system/rollover-csk-roll2/tests_rollover_csk_roll2.py
bin/tests/system/rollover-dynamic2inline/tests_rollover_dynamic2inline.py
bin/tests/system/rollover-enable-dnssec/tests_rollover_enable_dnssec.py
bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_initial.py
bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_reconfig.py
bin/tests/system/rollover-ksk-3crowd/tests_rollover_three_is_a_crowd.py
bin/tests/system/rollover-ksk-doubleksk/tests_rollover_ksk_doubleksk.py
bin/tests/system/rollover-lifetime/tests_rollover_lifetime_initial.py
bin/tests/system/rollover-lifetime/tests_rollover_lifetime_reconfig.py
bin/tests/system/rollover-multisigner/tests_rollover_multisigner.py
bin/tests/system/rollover-straight2none/tests_rollover_straight2none_initial.py
bin/tests/system/rollover-straight2none/tests_rollover_straight2none_reconfig.py
bin/tests/system/rollover-zsk-prepub/tests_rollover_zsk_prepublication.py
bin/tests/system/rollover/common.py
bin/tests/system/rollover/setup.py
bin/tests/system/rollover/tests_rollover_manual.py
bin/tests/system/rpzextra/tests_rpzextra.py
bin/tests/system/selftest/tests_zone_analyzer.py
bin/tests/system/shutdown/tests_shutdown.py
bin/tests/system/sortlist/tests_sortlist.py
bin/tests/system/statschannel/generic.py
bin/tests/system/statschannel/tests_xml.py
bin/tests/system/tcp/tests_tcp.py
bin/tests/system/timeouts/tests_tcp_timeouts.py
bin/tests/system/tools/tests_tools_nsec3hash.py
bin/tests/system/tsig/tests_badtime.py
bin/tests/system/tsig/tests_tsig_hypothesis.py
bin/tests/system/tsiggss/tests_isc_spnego_flaws.py
bin/tests/system/verify/tests_verify.py
bin/tests/system/wildcard/tests_wildcard.py
bin/tests/system/xfer/ans10/ans.py
bin/tests/system/xfer/ans9/ans.py
bin/tests/system/xfer/tests_xfer.py
bin/tests/system/xferquota/tests_xferquota.py
bin/tests/system/zero/ans5/ans.py
doc/arm/_ext/iscconf.py
doc/arm/_ext/mergegrammar.py
doc/misc/checkgrammar.py
pyproject.toml

index 73b1c576eeca419dd0ed03f5bb8f228382dbcf14..32a360ec296367da86fadcdc018829334f20cfa3 100755 (executable)
@@ -6,12 +6,12 @@
 #
 # Convert automake .trs files into JUnit format suitable for Gitlab
 
+from xml.etree import ElementTree
+from xml.etree.ElementTree import Element, SubElement
+
 import argparse
 import os
 import sys
-from xml.etree import ElementTree
-from xml.etree.ElementTree import Element
-from xml.etree.ElementTree import SubElement
 
 
 # getting explicit encoding specification right for Python 2/3 would be messy,
index 6ac5498d1dbcaa971ffba10f463c69c366a1ff64..3b822720a5f416c008a371e0ddf4826dbccedca2 100644 (file)
@@ -32,9 +32,7 @@ useful in other system tests, please consider opening a merge request extending
 isctest/asyncserver.py.
 """
 
-from isctest.asyncserver import (
-    AsyncDnsServer,
-)
+from isctest.asyncserver import AsyncDnsServer
 
 
 def main() -> None:
index 117a014e93286e68fc7f25d0b33f4f54b71672d7..7606236fdaa3667c4de42ff3ebf999ea8bae40c5 100644 (file)
@@ -16,11 +16,7 @@ from typing import AsyncGenerator
 import dns.rdatatype
 import dns.rrset
 
-from isctest.asyncserver import (
-    DnsResponseSend,
-    QueryContext,
-    ResponseAction,
-)
+from isctest.asyncserver import DnsResponseSend, QueryContext, ResponseAction
 
 from ..bailiwick_ans import ResponseSpoofer, spoofing_server
 
index 8dfa0749c823cae249b71d60cf8a04fc3b7dad99..187816735703be5f9750216cd4bb083e1a3bee85 100644 (file)
@@ -16,11 +16,7 @@ from typing import AsyncGenerator
 import dns.rdatatype
 import dns.rrset
 
-from isctest.asyncserver import (
-    DnsResponseSend,
-    QueryContext,
-    ResponseAction,
-)
+from isctest.asyncserver import DnsResponseSend, QueryContext, ResponseAction
 
 from ..bailiwick_ans import ResponseSpoofer, spoofing_server
 
index bd844bd71a3a3648b4c95f2baa4281a8944caef1..105fc6de5a1de48d68fc41eac2447cbde8d4e2b4 100644 (file)
@@ -14,12 +14,12 @@ from typing import Dict
 import time
 
 import dns.message
-
 import pytest
 
-import isctest
 from isctest.instance import NamedInstance
 
+import isctest
+
 
 @pytest.fixture(autouse=True)
 def autouse_flush_resolver_cache(servers: Dict[str, NamedInstance]) -> None:
index 26265ad612758ce0e641fd87df670ff85cbf1fc1..037517ca235458d5c875e2b200c876e2223cc97c 100755 (executable)
@@ -18,15 +18,15 @@ import os
 import sys
 import time
 
-import isctest
-import pytest
-
 import dns.exception
 import dns.message
 import dns.name
 import dns.rcode
 import dns.rdataclass
 import dns.rdatatype
+import pytest
+
+import isctest
 
 pytestmark = [
     pytest.mark.skipif(
index 4b2ba075187ed59c8ab816e48c05ed001559fc7c..94d0f255b79f42e947426950936601fabbd4e1a8 100644 (file)
@@ -11,9 +11,8 @@
 
 from re import compile as Re
 
-import pytest
-
 import dns.message
+import pytest
 
 import isctest
 import isctest.mark
index ce402ad6b492f33678e49621317985548773c117..d43c0da4841f91eb479a3db760d36e1f2d80749e 100644 (file)
@@ -9,24 +9,26 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import filecmp
-import os
 from pathlib import Path
 from re import compile as Re
+
+import filecmp
+import os
 import shutil
 import subprocess
+import sys
 import tempfile
 import time
-import sys
 
 import pytest
 
 pytest.register_assert_rewrite("isctest")
 
 # pylint: disable=wrong-import-position
-import isctest
 from isctest.vars.dirs import SYSTEM_TEST_DIR_GIT_PATH
 
+import isctest
+
 # pylint: enable=wrong-import-position
 
 # Silence warnings caused by passing a pytest fixture to another fixture.
index 83cf630274638c9b372cff07090f667cdae0f63e..429eaf09fea872bdc1afb4d7d347c36ed2e14d0c 100755 (executable)
@@ -6,11 +6,12 @@
 #
 # Convert JUnit pytest output to automake .trs files
 
-import argparse
 from pathlib import Path
-import sys
 from xml.etree import ElementTree
 
+import argparse
+import sys
+
 
 def junit_to_trs(junit_xml):
     root = ElementTree.fromstring(junit_xml)
index 72f0e0ab4670bd13870fdd29c87ac4f5add6d78f..84d3f7011c7caff21cbb065334f730d8dac0ca06 100644 (file)
@@ -20,12 +20,11 @@ import dns.tsigkeyring
 
 from isctest.asyncserver import (
     AsyncDnsServer,
-    ResponseHandler,
-    DnsResponseSend,
     DnsProtocol,
+    DnsResponseSend,
     QueryContext,
+    ResponseHandler,
 )
-
 from isctest.name import prepend_label
 from isctest.vars.algorithms import ALG_VARS
 
index 6f5346ff86c1243c1fd9bc9f617080b80220567a..d162070c76a56fcd7c1fc41f50055987d5b9bccd 100644 (file)
@@ -9,10 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-from isctest.asyncserver import (
-    AsyncDnsServer,
-    IgnoreAllQueries,
-)
+from isctest.asyncserver import AsyncDnsServer, IgnoreAllQueries
 
 
 def main() -> None:
index a53045305d5c813f8a4f91bad538b362ed397234..6039559449f458fbb0733c467c49466879fb5555 100644 (file)
@@ -9,9 +9,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import logging
 from typing import AsyncGenerator, List, Optional
 
+import logging
+
 import dns.rcode
 import dns.rdatatype
 import dns.rrset
index 77e7141590704d272411b5fb0f8289ed30ce90a3..e723d96c16e337c0c7e3f2121ffe3650489a09bd 100644 (file)
@@ -17,8 +17,8 @@ import dns.rcode
 from isctest.asyncserver import (
     AsyncDnsServer,
     DnsResponseSend,
-    ResponseHandler,
     QueryContext,
+    ResponseHandler,
 )
 
 
index 01a1bbc5c09b704f886b359694b6f6c81edab76a..e263580cadd351fa9338b8db08cb697a91ce9c02 100644 (file)
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import dns.message
 import pytest
-import isctest
 
-import dns.message
+import isctest
 
 pytestmark = pytest.mark.extra_artifacts(
     [
index 2e6c667d22c6649c5b3d39f08bd9bbec9a8a0ea3..efb5839ddc6c205b0a0baef7bbdf08939a862f54 100644 (file)
@@ -9,18 +9,18 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import base64
 from re import compile as Re
 
+import base64
 import os
-import pytest
 
 from cryptography.hazmat.primitives.asymmetric import ec
+from dns.rdtypes.dnskeybase import Flag
 
 import dns
 import dns.dnssec
 import dns.zone
-from dns.rdtypes.dnskeybase import Flag
+import pytest
 
 import isctest
 
index 67061ab9a5c5718d8770d5a4bf4548dce21a9c7c..9004c45e834fb5677256287c041b5027460cbdbe 100644 (file)
 import os
 import re
 
-import isctest
-import isctest.mark
+import dns.rrset
 import pytest
 
-import dns.rrset
+import isctest
+import isctest.mark
 
 pytestmark = [
     isctest.mark.with_dnstap,
index ab7e3c9adad86cfc16003f69f1b5a289af21a8a0..77bca8be7f29ca1e64365f509e97fd1873751cb3 100644 (file)
@@ -17,8 +17,8 @@ except (ModuleNotFoundError, ImportError):
     print("No python yaml module, skipping")
     sys.exit(1)
 
-import subprocess
 import pprint
+import subprocess
 
 DNSTAP_READ = sys.argv[1]
 DATAFILE = sys.argv[2]
index b95baeaab5a3f20a1c2b8a0ce3af526f1895166b..2c2104d2fd9ae045aea92a883254710846802af0 100644 (file)
@@ -14,6 +14,7 @@
 import shutil
 
 import pytest
+
 import isctest
 
 
index 930f944adf4c5504e80aaa9ee10af39a64cc8003..82730c25a5e60901a69baac669717a583c8761a7 100755 (executable)
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+from functools import reduce
+from resource import RLIMIT_NOFILE, getrlimit, setrlimit
+
 import os
-import sys
+import random
 import socket
 import subprocess
-import random
+import sys
 import time
 
-from functools import reduce
-from resource import getrlimit
-from resource import setrlimit
-from resource import RLIMIT_NOFILE
-
 MULTIDIG_INSTANCES = 10
 CONNECT_TRIES = 5
 
index 70ddd261f6a5221ab623de1720db85b6d9dabe23..16ecdb5073aa166d3c4a71b3d093a7fa7d98bbdb 100644 (file)
@@ -16,13 +16,12 @@ import struct
 import subprocess
 import time
 
-import pytest
-
 import dns
 import dns.exception
 import dns.name
 import dns.rdataclass
 import dns.rdatatype
+import pytest
 
 import isctest
 
index 08b4ee0e685a18a932050aa8852b67acac2e4fa9..95fcaf98565b1045c7f8e3997f118ae8a5dde896 100644 (file)
@@ -10,9 +10,9 @@
 # information regarding copyright ownership.
 
 import os
-import pytest
 
 import dns.flags
+import pytest
 
 import isctest
 
index e5ff22e977226aaefdc5518f85bfd8872a76ad4f..6db8f197564069c03ba727e71e72546cbdf4a0fd 100644 (file)
@@ -9,9 +9,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import dns
 from dns import rdataclass, rdatatype
 
+import dns
+
 import isctest
 
 ARTIFACTS = [
index cb690eb35285971bd636a3368c601743ad9d019c..e38a4f142263f570032014b6db56f7eabe9d2ff3 100644 (file)
@@ -11,8 +11,6 @@
 
 import pytest
 
-import isctest.mark
-
 from filters.common import (
     ARTIFACTS,
     check_filter,
@@ -20,6 +18,8 @@ from filters.common import (
     prime_cache,
 )
 
+import isctest.mark
+
 pytestmark = pytest.mark.extra_artifacts(ARTIFACTS)
 
 
index 1d33f2fd0577239759c46c222d6548e0f94a578e..69d56c0daee58cd0b9bb22ee3fa3c8237838a282 100644 (file)
@@ -11,8 +11,6 @@
 
 import pytest
 
-import isctest.mark
-
 from filters.common import (
     ARTIFACTS,
     check_filter,
@@ -20,6 +18,8 @@ from filters.common import (
     prime_cache,
 )
 
+import isctest.mark
+
 pytestmark = pytest.mark.extra_artifacts(ARTIFACTS)
 
 
index 3c783a9cf32b2b71ea6abf385ffdd35ab2776081..adf46add049d39d75e044ae5493783ca5a231ea9 100644 (file)
@@ -11,9 +11,6 @@
 
 import pytest
 
-import isctest
-import isctest.mark
-
 from filters.common import (
     ARTIFACTS,
     check_filter,
@@ -21,6 +18,9 @@ from filters.common import (
     prime_cache,
 )
 
+import isctest
+import isctest.mark
+
 pytestmark = pytest.mark.extra_artifacts(ARTIFACTS)
 
 
index b973724e1451b665eafb9d4884cbf34223fca6af..001a0dd5bf55b63abfc770745740129fbbfe80b8 100644 (file)
@@ -11,8 +11,6 @@
 
 import pytest
 
-import isctest.mark
-
 from filters.common import (
     ARTIFACTS,
     check_filter,
@@ -20,6 +18,8 @@ from filters.common import (
     prime_cache,
 )
 
+import isctest.mark
+
 pytestmark = pytest.mark.extra_artifacts(ARTIFACTS)
 
 
index de5eae132fd76c4ecc381271e5dd5f7c0ec3b8aa..46ab794c8aeffa31f369ff1f5416e0d77c486aac 100644 (file)
@@ -15,10 +15,10 @@ import subprocess
 
 import pytest
 
-import isctest
-
 from filters.common import ARTIFACTS
 
+import isctest
+
 pytestmark = pytest.mark.extra_artifacts(ARTIFACTS)
 
 
index 39c0bbc603fd01111ea51ce140d6e33fd3ddbbbe..dfa71b76c1d3b93398ac4b60fc029a979d7b712e 100644 (file)
 
 import pytest
 
-import isctest
-
 from filters.common import ARTIFACTS
 
+import isctest
+
 pytestmark = pytest.mark.extra_artifacts(ARTIFACTS)
 
 
index 4b5f299376ab94389def30ce6c428ecf15580422..c5e4fc0ed54661a7756a1abb4e2c6fa4551a374f 100644 (file)
@@ -9,15 +9,17 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-from . import check
-from . import instance
-from . import hypothesis
-from . import query
-from . import kasp
-from . import run
-from . import template
-from . import log
-from . import vars  # pylint: disable=redefined-builtin
+from . import (  # pylint: disable=redefined-builtin
+    check,
+    hypothesis,
+    instance,
+    kasp,
+    log,
+    query,
+    run,
+    template,
+    vars,
+)
 
 # isctest.mark module is intentionally NOT imported, because it relies on
 # environment variables which might not be set at the time of import of the
index 8e4ea245e5ac9fcca94441177bab552ff372902b..72979399a61c9df03ce7086b89c0de93f51b9742 100644 (file)
@@ -20,8 +20,8 @@ from typing import (
     Dict,
     List,
     Optional,
-    Set,
     Sequence,
+    Set,
     Tuple,
     Union,
     cast,
index d6a222aded18dc7f0720d3ed37d3a09716fef5e1..b2a746635151964a91f88b40a0322640c67caba7 100644 (file)
@@ -9,12 +9,14 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+from typing import List, Optional, cast
+
 import difflib
 import shutil
-from typing import cast, List, Optional
 
-import dns.edns
 from dns.edns import EDECode, EDEOption
+
+import dns.edns
 import dns.flags
 import dns.message
 import dns.rcode
index 6c2cc00210fbb24ac746f91368c6da51bea6f91b..e4cda096293c7b8b1c35c9ecae98136b78a6703e 100644 (file)
@@ -12,5 +12,4 @@
 # This ensures we're using a suitable hypothesis version. A newer version is
 # required for FIPS-enabled platforms.
 
-from . import settings
-from . import strategies
+from . import settings, strategies
index e8badc6802b955ae0a17978248be7d630a6f944a..1a008518890090b92dcda45b014a7a3f963a9ad5 100644 (file)
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import collections.abc
 from typing import List, Union
 from warnings import warn
 
+import collections.abc
+
 from hypothesis.strategies import (
     binary,
     builds,
@@ -26,8 +27,8 @@ from hypothesis.strategies import (
     sampled_from,
 )
 
-import dns.name
 import dns.message
+import dns.name
 import dns.rdataclass
 import dns.rdatatype
 
index 129a2a907a7a6c8ac41e22257a6bdf7025514487..58e027fe8eff0e443b4067bc550d2bbad795ce42 100644 (file)
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+from pathlib import Path
 from typing import List, NamedTuple, Optional
 
 import os
-from pathlib import Path
 import re
 
-import dns.update
 import dns.rcode
+import dns.update
 
-from .log import debug, WatchLogFromStart, WatchLogFromHere
-from .run import CmdResult, EnvCmd, perl
+from .log import WatchLogFromHere, WatchLogFromStart, debug
 from .query import udp
+from .run import CmdResult, EnvCmd, perl
 from .text import TextFile
 
 
index 8098afecb61e5be62166242e1dd434cf62a6ec96..f5e8160dd9b8e158c2f265af5765dc0434990094 100644 (file)
 
 from datetime import datetime, timedelta, timezone
 from functools import total_ordering
+from pathlib import Path
+from re import compile as Re
+from typing import Dict, List, Optional, Tuple, Union
+
 import glob
 import os
-from pathlib import Path
 import re
-from re import compile as Re
 import time
-from typing import Dict, List, Optional, Tuple, Union
 
 import dns
 import dns.dnssec
@@ -25,12 +26,13 @@ import dns.rdatatype
 import dns.rrset
 import dns.tsig
 
+from isctest.instance import NamedInstance
+from isctest.template import TrustAnchor
+from isctest.vars.algorithms import ALL_ALGORITHMS_BY_NUM, Algorithm
+
 import isctest.log
 import isctest.query
 import isctest.util
-from isctest.instance import NamedInstance
-from isctest.template import TrustAnchor
-from isctest.vars.algorithms import Algorithm, ALL_ALGORITHMS_BY_NUM
 
 DEFAULT_TTL = 300
 
index 228f69e5bfa7bdadb6479b99d9a5f44f49f9b66f..45ec242e399604387e77d4331bd8e31eff0dc013 100644 (file)
 
 from .basic import (
     avoid_duplicated_logs,
+    critical,
+    debug,
     deinit_module_logger,
     deinit_test_logger,
+    error,
+    info,
     init_conftest_logger,
     init_module_logger,
     init_test_logger,
-    debug,
-    info,
     warning,
-    error,
-    critical,
 )
-
-from .watchlog import WatchLogFromStart, WatchLogFromHere
+from .watchlog import WatchLogFromHere, WatchLogFromStart
index 812e83e254456618d1a392d30d0191356f859043..89201f61c7185a328a0662aa32a7a1d3d684f75d 100644 (file)
@@ -9,11 +9,12 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import logging
 from pathlib import Path
-import textwrap
 from typing import Dict, Optional
 
+import logging
+import textwrap
+
 LOG_FORMAT = "%(asctime)s %(levelname)7s:%(name)s  %(message)s"
 LOG_INDENT = 4
 
index d7154995b7d9b8698e10bf43a445f28a48f70dc4..5c2bab0f202dcb5f0c1cd49d4d30668183f4adff 100644 (file)
@@ -15,7 +15,7 @@ import abc
 import os
 import time
 
-from isctest.text import compile_pattern, FlexPattern, LineReader
+from isctest.text import FlexPattern, LineReader, compile_pattern
 
 T = TypeVar("T")
 OneOrMore = Union[T, List[T]]
index 4d7fcce147b6fc6c1650efb422139de1774ce733..81f37749726c59796ad25202027c9c3e364c3497 100644 (file)
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import os
 from pathlib import Path
+
+import os
 import platform
-import socket
 import shutil
+import socket
 import subprocess
 
 import pytest
index cc836f85db5e91065c79b42129b8df410d6f4549..cc80f44d7950084b04c5d551013cdcc13ff71979 100644 (file)
@@ -9,13 +9,13 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-from typing import Iterable, FrozenSet
+from typing import FrozenSet, Iterable
+
+from dns.name import Name
 
 import dns.name
-import dns.zone
 import dns.rdatatype
-
-from dns.name import Name
+import dns.zone
 
 
 def prepend_label(label: str, name: Name) -> Name:
index daa8ade0142f391d1c5aab7b6bc95ae0315cb761..f8a62150c40b8c9b74e09282f3f2ad5fafcdedf1 100644 (file)
@@ -9,12 +9,13 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+from typing import Any, Callable, Optional
+
 import os
 import time
-from typing import Any, Callable, Optional
 
-import dns.query
 import dns.message
+import dns.query
 
 import isctest.log
 
index 65fd5ec8df56a8046c7c48a37f9b9941da82a4a6..7c7559726d2c7abda1fadd89c9c5baa705158748 100644 (file)
@@ -9,11 +9,12 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import os
 from pathlib import Path
+from typing import List, Optional
+
+import os
 import subprocess
 import time
-from typing import List, Optional
 
 import isctest.log
 import isctest.text
index 33798c37032863a9849a96b796c22366eabe85c1..549f06ff7f3f9dedc599d75a89bc35270e1cdc3a 100644 (file)
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import abc
-import re
 from re import compile as Re
 from typing import Iterator, List, Match, Optional, Pattern, TextIO, Union
 
+import abc
+import re
+
 FlexPattern = Union[str, Pattern]
 
 
index 3ebaf3df5e85b6cd55256342e8e79722cd7562cb..3fea2f345c74477ca478a5e4f1cc13828c46891f 100644 (file)
 
 import os
 
-from .all import ALL
+from .. import log
 from .algorithms import init_crypto_supported, set_algorithm_set
+from .all import ALL
 from .features import init_features
 from .openssl import parse_openssl_config
-from .. import log
 
 
 def init_vars():
index 446ab09d695a1e38c4c31487ebb8a89fd90e7c2b..65740b86a29b460d0ac63b96af9d6d8ae647f5a9 100644 (file)
@@ -9,16 +9,17 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+from typing import Dict, List, NamedTuple, Optional, Union
+
 import os
 import platform
 import random
 import subprocess
 import tempfile
 import time
-from typing import Dict, List, NamedTuple, Optional, Union
 
-from .basic import BASIC_VARS
 from .. import log
+from .basic import BASIC_VARS
 
 # Algorithms are selected randomly at runtime from a list of supported
 # algorithms. The randomization is deterministic and remains stable for a
index 9dedeec8f8bd9f66368eb7e730ecd5514f65b1be..d295aef0b1c448f6a3d21ecf2ffb4cb903d340ea 100644 (file)
@@ -11,8 +11,8 @@
 
 from collections import ChainMap
 
-from .autoconf import AC_VARS  # type: ignore
 from .algorithms import ALG_VARS, CRYPTO_SUPPORTED_VARS
+from .autoconf import AC_VARS  # type: ignore
 from .basic import BASIC_VARS
 from .dirs import DIR_VARS
 from .features import FEATURE_VARS
index 05790e044d8692c65d31b2dbd0c9a371618c9e06..b8e97787ee69e0303e65e6b8cc2a0e453c051bfa 100644 (file)
@@ -13,7 +13,6 @@ import os
 
 from .autoconf import AC_VARS  # type: ignore
 
-
 BASIC_VARS = {
     "ARPANAME": f"{AC_VARS['TOP_BUILDDIR']}/bin/tools/arpaname",
     "CDS": f"{AC_VARS['TOP_BUILDDIR']}/bin/dnssec/dnssec-cds",
index 1d6f6fbdf3945a9fc4d60a7d2f2158b6df0f2c10..f04f4784837d6b4d9fe2ffab69b8fbd7de332bf2 100644 (file)
@@ -13,7 +13,6 @@ import os
 
 from .autoconf import AC_VARS  # type: ignore
 
-
 SYSTEM_TEST_DIR_GIT_PATH = "bin/tests/system"
 
 DIR_VARS = {
index b84f526dd86f107438ad4f1eb61508d6a1001ddb..1287b0bb35713a0807c614324fd1d0d1c736b159 100644 (file)
@@ -9,10 +9,11 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import os
 from re import compile as Re
 from typing import Optional
 
+import os
+
 from .. import log
 
 OPENSSL_VARS = {
index 207b5e49ffdf088a6e5951a1df9615dbfb3ed62f..aa8b00949998cb7d905330de3402421e2efc31c1 100644 (file)
@@ -11,6 +11,8 @@ See the COPYRIGHT file distributed with this work for additional
 information regarding copyright ownership.
 """
 
+from typing import AsyncGenerator, Collection, Iterable
+
 import abc
 
 import dns.rcode
@@ -18,8 +20,6 @@ import dns.rdataclass
 import dns.rdatatype
 import dns.rrset
 
-from typing import AsyncGenerator, Collection, Iterable
-
 from isctest.asyncserver import (
     ControllableAsyncDnsServer,
     DnsResponseSend,
index 769600ec94c2f5a95b947c001a7d8562d8ad53f3..373985aeac00ef866df9d77f79a4736b19edd4fa 100644 (file)
@@ -11,6 +11,8 @@ See the COPYRIGHT file distributed with this work for additional
 information regarding copyright ownership.
 """
 
+from typing import AsyncGenerator, Collection, Iterable
+
 import abc
 
 import dns.rcode
@@ -18,8 +20,6 @@ import dns.rdataclass
 import dns.rdatatype
 import dns.rrset
 
-from typing import AsyncGenerator, Collection, Iterable
-
 from isctest.asyncserver import (
     ControllableAsyncDnsServer,
     DnsResponseSend,
index c233f0b3b46f537c3e1996a34269587284608e09..42c7ec9544a66c74a1b3463d1b4a47ed4ef1e228 100644 (file)
@@ -9,26 +9,24 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+from datetime import timedelta
+
 import os
 import shutil
 import subprocess
 import time
 
-from datetime import timedelta
-
 import dns
 import dns.update
 import pytest
 
-import isctest
-import isctest.mark
-from isctest.kasp import (
-    KeyProperties,
-    KeyTimingMetadata,
-)
+from isctest.kasp import KeyProperties, KeyTimingMetadata
 from isctest.util import param
 from isctest.vars.algorithms import ECDSAP256SHA256, ECDSAP384SHA384
 
+import isctest
+import isctest.mark
+
 pytestmark = pytest.mark.extra_artifacts(
     [
         "K*.private",
index 7a90c7cb43d96a2d4f36dc3dd4e2c258e866b787..92657515a99a8c5a55ad41c430d09bd8c5354c70 100644 (file)
@@ -9,9 +9,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import isctest
 import pytest
 
+import isctest
+
 pytestmark = pytest.mark.extra_artifacts(
     ["ns2/named.stats"],
 )
index 44f14077ed7285f7cc677ddf493048423ce3306d..5ddf80334a8baee15b7c35915f3e35ab325a3392 100644 (file)
@@ -9,9 +9,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+from re import compile as Re
+
 import hashlib
 import os
-from re import compile as Re
 import shutil
 
 import pytest
index fd5f17ae4c770685b651faa005e95953e9716964..4eacfc925e8524c80ee9906abcfff55429f87410 100644 (file)
@@ -10,6 +10,7 @@
 # information regarding copyright ownership.
 
 from datetime import timedelta
+
 import os
 import re
 import shutil
@@ -17,9 +18,10 @@ import time
 
 import pytest
 
-import isctest
 from isctest.kasp import KeyTimingMetadata
 
+import isctest
+
 pytestmark = pytest.mark.extra_artifacts(
     [
         "K*",
index 6949838ec74fc5f1f185c7808a889765c5337571..512c02ecca1a565361970ec0e7c79285c77cc328 100644 (file)
 
 import itertools
 
-import isctest
+import dns.rrset
 import pytest
 
-import dns.rrset
+import isctest
 
 
 @pytest.mark.parametrize(
index cb5f6e20516d433b19153e3e1363af326640f7d5..76c670fafbb70884e9b63a32a851c134dde88f44 100644 (file)
@@ -9,9 +9,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import os
 from datetime import timedelta
 
+import os
+
 import pytest
 
 import isctest
index d20cdff8d4430297f8fc98cd85abc6f11b659d8f..f2b5cd7e3291e951e5efc9b028fdd8fa96bad787 100644 (file)
 # information regarding copyright ownership.
 
 from datetime import timedelta
-import os
 from re import compile as Re
 
-import pytest
+import os
 
 import dns
 import dns.update
+import pytest
 
 import isctest
 
index ebd0ea66233d35d57d3c4cabbecb86550c001ca4..c926d053f1901e88ebe73c6f16f4006cc12e55c1 100755 (executable)
 # pylint: disable=unreachable
 
 from dataclasses import dataclass
-import os
 from pathlib import Path
 from typing import Container, Iterable, Optional, Set, Tuple
 
-import pytest
+import os
+
+from hypothesis import assume, given
 
 import dns.dnssec
 import dns.message
@@ -29,16 +30,16 @@ import dns.query
 import dns.rcode
 import dns.rdataclass
 import dns.rdatatype
-import dns.rdtypes.ANY.RRSIG
 import dns.rdtypes.ANY.NSEC3
+import dns.rdtypes.ANY.RRSIG
 import dns.rrset
+import pytest
 
 from isctest.hypothesis.strategies import dns_names, sampled_from
+
 import isctest
 import isctest.name
 
-from hypothesis import assume, given
-
 SUFFIX = dns.name.from_text(".")
 AUTH = "10.53.0.1"
 RESOLVER = "10.53.0.2"
index ac5bb9c5f30dfdacdaf1d03dca1c21b058562a8f..8cfa672d4d61fdd67bd73a76d09860e8eea2dc6f 100644 (file)
@@ -9,10 +9,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import os
-
 from datetime import timedelta
 
+import os
+
 import dns
 import pytest
 
index d5ec16f5b403ea3f83e23adf3386c767a4bea1fd..beaea9554d6d5f84c8bb845af20127f605542079 100644 (file)
@@ -19,16 +19,11 @@ import dns
 import dns.update
 import pytest
 
+from isctest.vars.algorithms import RSASHA1
+from nsec3.common import ALGORITHM, SIZE, check_nsec3_case, default_config, pytestmark
+
 import isctest
 import isctest.mark
-from isctest.vars.algorithms import RSASHA1
-from nsec3.common import (
-    ALGORITHM,
-    SIZE,
-    default_config,
-    pytestmark,
-    check_nsec3_case,
-)
 
 # include the following zones when rendering named configs
 ZONES = {
index 42c0f2b2aeff898ca2e0273c2af381fd59722aeb..7f9b4c3e8d4eafd0b8cb1d0c9ef99348b5ce1dd5 100644 (file)
@@ -17,16 +17,11 @@ import dns
 import dns.update
 import pytest
 
+from isctest.vars.algorithms import RSASHA1
+from nsec3.common import ALGORITHM, SIZE, check_nsec3_case, default_config, pytestmark
+
 import isctest
 import isctest.mark
-from isctest.vars.algorithms import RSASHA1
-from nsec3.common import (
-    ALGORITHM,
-    SIZE,
-    default_config,
-    pytestmark,
-    check_nsec3_case,
-)
 
 # include the following zones when rendering named configs
 ZONES = {
index cb75f1caa49f138f88eb4b53434e2b69cd8f8e6f..a725039ed46e973ac6936bb8bd6885e87ecb2b29 100644 (file)
@@ -19,16 +19,11 @@ import dns
 import dns.update
 import pytest
 
+from isctest.vars.algorithms import RSASHA1
+from nsec3.common import ALGORITHM, SIZE, check_nsec3_case, default_config, pytestmark
+
 import isctest
 import isctest.mark
-from isctest.vars.algorithms import RSASHA1
-from nsec3.common import (
-    ALGORITHM,
-    SIZE,
-    default_config,
-    pytestmark,
-    check_nsec3_case,
-)
 
 # include the following zones when rendering named configs
 ZONES = {
index 33171932bd615583f0d0087f8f32d4ff7b918a7a..d23d7df64b6d97e14867b0a79a95153e06805666 100644 (file)
@@ -18,12 +18,9 @@ import time
 import dns
 import pytest
 
+from nsec3.common import ALGORITHM, SIZE, check_nsec3_case
+
 import isctest
-from nsec3.common import (
-    ALGORITHM,
-    SIZE,
-    check_nsec3_case,
-)
 
 # include the following zones when rendering named configs
 ZONES = {
index 9771fd581281db20073bcafc017a7a32a6e2fdef..63c653817239dc8c18ff71e69030eeb2d0e956d4 100644 (file)
@@ -17,17 +17,18 @@ import dns
 import dns.update
 import pytest
 
-import isctest
-import isctest.mark
 from nsec3.common import (
     ALGORITHM,
     SIZE,
-    default_config,
-    pytestmark,
     check_nsec3_case,
     check_nsec3param,
+    default_config,
+    pytestmark,
 )
 
+import isctest
+import isctest.mark
+
 # include the following zones when rendering named configs
 ZONES = {
     "nsec3.kasp",
index c4b9b3284cf6cf1469365c8359dac3c33bfb174a..cd5aca5224d0377e76490fb4df0481721b218d6f 100644 (file)
@@ -12,6 +12,7 @@
 # pylint: disable=redefined-outer-name,unused-import
 
 from datetime import timedelta
+
 import os
 import shutil
 
@@ -19,14 +20,11 @@ import dns
 import dns.update
 import pytest
 
+from isctest.vars.algorithms import RSASHA256
+from nsec3.common import check_auth_nsec3, check_nsec3param, pytestmark
+
 import isctest
 import isctest.mark
-from isctest.vars.algorithms import RSASHA256
-from nsec3.common import (
-    pytestmark,
-    check_auth_nsec3,
-    check_nsec3param,
-)
 
 DNSKEY_TTL = int(timedelta(hours=1).total_seconds())
 ZSK_LIFETIME = int(timedelta(days=90).total_seconds())
index ab066c4beeb27cc03484a79490a564256d5a4cc1..da1f43886b2e95befbc04c4dec0ca606cd92523a 100644 (file)
@@ -9,11 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-from isctest.asyncserver import (
-    AsyncDnsServer,
-    IgnoreAllConnections,
-    IgnoreAllQueries,
-)
+from isctest.asyncserver import AsyncDnsServer, IgnoreAllConnections, IgnoreAllQueries
 
 
 def main() -> None:
index 790e937556aaae42b7bd0ea02d985215c5c3a2bd..54e5a2c95b20e26d175450b1294dc477a98f4630 100644 (file)
@@ -11,6 +11,7 @@
 
 
 import os
+
 import pytest
 
 import isctest
index 1cc0132e3e15abd463f223237f27b7e33e16d8af..3944649f2d8ddde9583645f19f629b4d77d8dd1e 100755 (executable)
@@ -16,9 +16,6 @@ import os
 import re
 import sys
 
-import isctest
-import pytest
-
 import dns
 import dns.exception
 import dns.message
@@ -27,6 +24,9 @@ import dns.query
 import dns.rcode
 import dns.rdataclass
 import dns.rdatatype
+import pytest
+
+import isctest
 
 pytestmark = [
     pytest.mark.skipif(
index 5dd214f18e5b758f0ac18cb23269e5c00f685800..447f88e17ec67850dc3e772ff4e57a96742bdc17 100644 (file)
@@ -14,7 +14,6 @@
 import re
 
 from astroid import nodes
-
 from pylint.checkers import BaseRawFileChecker
 from pylint.lint import PyLinter
 
index 052f212f1ce80695a92d24072d9e045379a1746d..a94a99ce29f8c8ae46560a1f8b0d406ef0c315f7 100644 (file)
@@ -15,8 +15,8 @@ from typing import AsyncGenerator, Tuple, Union
 
 import dns.name
 import dns.rcode
-import dns.rrset
 import dns.rdatatype
+import dns.rrset
 
 from isctest.asyncserver import (
     AsyncDnsServer,
@@ -26,8 +26,8 @@ from isctest.asyncserver import (
     QnameHandler,
     QnameQtypeHandler,
     QueryContext,
-    StaticResponseHandler,
     ResponseHandler,
+    StaticResponseHandler,
 )
 
 from ..resolver_ans import (
index f3143f512dc340fd3d5645a33dced418aa232b28..36172f768512379fd9a568e79f3f4d0b16bc1a05 100644 (file)
@@ -25,8 +25,8 @@ from isctest.asyncserver import (
     QnameHandler,
     QnameQtypeHandler,
     QueryContext,
-    StaticResponseHandler,
     ResponseHandler,
+    StaticResponseHandler,
 )
 
 from ..resolver_ans import (
index 7d677265faca5b105862dfb07ed30120e9d2e819..6ef65f21571ff996cc42bb7d12d9e3ba581a4650 100644 (file)
@@ -11,10 +11,10 @@ See the COPYRIGHT file distributed with this work for additional
 information regarding copyright ownership.
 """
 
-import abc
-
 from typing import AsyncGenerator
 
+import abc
+
 import dns.flags
 import dns.message
 import dns.rcode
@@ -22,8 +22,8 @@ import dns.rdatatype
 
 from isctest.asyncserver import (
     AsyncDnsServer,
-    DnsResponseSend,
     DnsProtocol,
+    DnsResponseSend,
     DomainHandler,
     QnameHandler,
     QnameQtypeHandler,
index 652293792ba5f7013e89f1f26321bdebeea7092d..35a73f14cd9b013761b0e142c8859e14dd436b05 100644 (file)
@@ -10,6 +10,7 @@
 # information regarding copyright ownership.
 
 import pytest
+
 from isctest.mark import live_internet_test
 
 pytestmark = pytest.mark.extra_artifacts(
index 131933f40f674718c169d69c2342af812fe90576..ae610eeae5dd5058da96699afc74c883572b1772 100644 (file)
 
 import pytest
 
-import isctest
 from isctest.util import param
-from rollover.common import (
-    pytestmark,
-    CDSS,
-    DURATION,
-    TIMEDELTA,
-    ALGOROLL_CONFIG,
-)
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_algo_csk,
-)
+from rollover.common import ALGOROLL_CONFIG, CDSS, DURATION, TIMEDELTA, pytestmark
+from rollover.setup import configure_algo_csk, configure_root, configure_tld
+
+import isctest
 
 POLICY = "csk-algoroll"
 
index 8c7c2badbad49fc8ddbd865d9d54f45a79f9d860..f1420f69340bf6363662b862a92961a3615f1f5a 100644 (file)
 
 import pytest
 
-import isctest
 from isctest.kasp import KeyTimingMetadata
 from isctest.util import param
 from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    CDSS,
     ALGOROLL_CONFIG,
     ALGOROLL_IPUB,
     ALGOROLL_IPUBC,
@@ -29,14 +24,16 @@ from rollover.common import (
     ALGOROLL_KEYTTLPROP,
     ALGOROLL_OFFSETS,
     ALGOROLL_OFFVAL,
+    CDSS,
     DURATION,
     TIMEDELTA,
+    alg,
+    pytestmark,
+    size,
 )
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_algo_csk,
-)
+from rollover.setup import configure_algo_csk, configure_root, configure_tld
+
+import isctest
 
 CONFIG = ALGOROLL_CONFIG
 POLICY = "csk-algoroll"
index 2f74cd0fa42a7be0af4a6c925d2fa93c31bc3e59..4abef13fca59faca26ca5799055481bf9ceff898 100644 (file)
 
 import pytest
 
-import isctest
 from isctest.util import param
-from rollover.common import (
-    pytestmark,
-    CDSS,
-    DURATION,
-    TIMEDELTA,
-    ALGOROLL_CONFIG,
-)
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_algo_ksk_zsk,
-)
+from rollover.common import ALGOROLL_CONFIG, CDSS, DURATION, TIMEDELTA, pytestmark
+from rollover.setup import configure_algo_ksk_zsk, configure_root, configure_tld
+
+import isctest
 
 
 def bootstrap():
index cfac1739f8bb831ec61a97ba83791cb4eecdf349..9a5db0fdd2af2b7ac4b260324cfb77916adc233e 100644 (file)
 
 import pytest
 
-import isctest
 from isctest.kasp import KeyTimingMetadata
 from isctest.util import param
 from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    CDSS,
     ALGOROLL_CONFIG,
     ALGOROLL_IPUB,
     ALGOROLL_IPUBC,
@@ -29,14 +24,16 @@ from rollover.common import (
     ALGOROLL_KEYTTLPROP,
     ALGOROLL_OFFSETS,
     ALGOROLL_OFFVAL,
+    CDSS,
     DURATION,
     TIMEDELTA,
+    alg,
+    pytestmark,
+    size,
 )
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_algo_ksk_zsk,
-)
+from rollover.setup import configure_algo_ksk_zsk, configure_root, configure_tld
+
+import isctest
 
 CONFIG = ALGOROLL_CONFIG
 POLICY = "ecdsa256"
index b598cd6888bd827ef35789c64d1d8b9cdd2ab6fd..806975b92973f223772b5e4a19cd26ef10e31701 100644 (file)
@@ -15,20 +15,12 @@ from datetime import timedelta
 
 import pytest
 
-import isctest
 from isctest.kasp import Ipub, Iret
 from isctest.util import param
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    TIMEDELTA,
-)
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_cskroll1,
-)
+from rollover.common import TIMEDELTA, alg, pytestmark, size
+from rollover.setup import configure_cskroll1, configure_root, configure_tld
+
+import isctest
 
 CDSS = ["CDNSKEY", "CDS (SHA-384)"]
 CONFIG = {
index 983d38223688dc97ab79808841a80be0aecbceb1..1234d1fd37c75a61a1e615cb087b73cf4bd0b227 100644 (file)
@@ -15,20 +15,12 @@ from datetime import timedelta
 
 import pytest
 
-import isctest
 from isctest.kasp import Ipub, Iret
 from isctest.util import param
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    TIMEDELTA,
-)
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_cskroll2,
-)
+from rollover.common import TIMEDELTA, alg, pytestmark, size
+from rollover.setup import configure_cskroll2, configure_root, configure_tld
+
+import isctest
 
 CDSS = ["CDNSKEY", "CDS (SHA-256)", "CDS (SHA-384)"]
 CONFIG = {
index 7ec859119538a4ed1a1e10527057c6207936c671..946a7c14201c6b10b4b9807bf25bd6c58f5f8ac3 100644 (file)
 
 # pylint: disable=redefined-outer-name,unused-import
 
+from rollover.common import CDSS, DEFAULT_CONFIG, alg, pytestmark, size
+
 import isctest
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    CDSS,
-    DEFAULT_CONFIG,
-)
 
 
 def test_dynamic2inline(alg, size, ns3, templates):
index 23d47bdbb69bc81363ac7509defc6be0c833f3f7..22068f58cd9db7be7dfb88e33ffa36211456f9a3 100644 (file)
 
 import pytest
 
-import isctest
 from isctest.kasp import Ipub, IpubC, Iret
 from isctest.util import param
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    CDSS,
-    TIMEDELTA,
-)
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_enable_dnssec,
-)
+from rollover.common import CDSS, TIMEDELTA, alg, pytestmark, size
+from rollover.setup import configure_enable_dnssec, configure_root, configure_tld
+
+import isctest
 
 CONFIG = {
     "dnskey-ttl": TIMEDELTA["PT5M"],
index 92950124ed8478694403e55f2e2278c0b2ecb7d3..19f8c0457b50ff42474670f81d4e3517ada948ec 100644 (file)
 
 import pytest
 
+from rollover.common import CDSS, DURATION, UNSIGNING_CONFIG, alg, pytestmark, size
+from rollover.setup import configure_going_insecure, configure_root, configure_tld
+
 import isctest
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    CDSS,
-    DURATION,
-    UNSIGNING_CONFIG,
-)
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_going_insecure,
-)
 
 
 def bootstrap():
index 5cd8d65816784f4df860402d7df71e6ada97dda6..8b27e5ac8e9b92e365adaa5028446e351e36097d 100644 (file)
 
 import pytest
 
-import isctest
 from rollover.common import (
-    pytestmark,
-    alg,
-    size,
     CDSS,
     DEFAULT_CONFIG,
     DURATION,
     UNSIGNING_CONFIG,
+    alg,
+    pytestmark,
+    size,
 )
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_going_insecure,
-)
+from rollover.setup import configure_going_insecure, configure_root, configure_tld
+
+import isctest
 
 
 def bootstrap():
index dbbf1361494cf18b4141f5441ea2829bfd28aa83..33088582126642db3994441115f9dfd4ddae5635 100644 (file)
 
 from datetime import timedelta
 
-import isctest
 from isctest.kasp import KeyTimingMetadata
 from rollover.common import (
-    pytestmark,
-    alg,
-    size,
     KSK_CONFIG,
-    KSK_LIFETIME_POLICY,
     KSK_IPUB,
     KSK_IRET,
+    KSK_LIFETIME_POLICY,
+    alg,
+    pytestmark,
+    size,
 )
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_ksk_3crowd,
-)
+from rollover.setup import configure_ksk_3crowd, configure_root, configure_tld
+
+import isctest
 
 CDSS = ["CDS (SHA-256)"]
 POLICY = "ksk-doubleksk-autosign"
index 46e85242958fa0bbb6d722f019f240ab91eae126..8ea0853ea1e9740b3630c426584efdbd32f0eecf 100644 (file)
@@ -15,26 +15,23 @@ from datetime import timedelta
 
 import pytest
 
-import isctest
 from isctest.util import param
 from rollover.common import (
-    pytestmark,
-    alg,
-    size,
     KSK_CONFIG,
-    KSK_LIFETIME,
-    KSK_LIFETIME_POLICY,
     KSK_IPUB,
     KSK_IPUBC,
     KSK_IRET,
     KSK_KEYTTLPROP,
+    KSK_LIFETIME,
+    KSK_LIFETIME_POLICY,
     TIMEDELTA,
+    alg,
+    pytestmark,
+    size,
 )
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_ksk_doubleksk,
-)
+from rollover.setup import configure_ksk_doubleksk, configure_root, configure_tld
+
+import isctest
 
 CDSS = ["CDS (SHA-256)"]
 POLICY = "ksk-doubleksk"
index a7f5ead0fad53ad6b46f0a4a8b9d2ee1c5e71f2a..b6052c8a17f590cde32ab32b538d4199818daa6f 100644 (file)
 
 import pytest
 
-import isctest
 from isctest.util import param
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    CDSS,
-    DEFAULT_CONFIG,
-    DURATION,
-)
+from rollover.common import CDSS, DEFAULT_CONFIG, DURATION, alg, pytestmark, size
+
+import isctest
 
 
 @pytest.mark.parametrize(
index d28a7e4cd5b924949b82e28e30652dafd102611e..4da706497396324455219b392638fa7a741d8a54 100644 (file)
 
 import pytest
 
-import isctest
 from isctest.util import param
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    CDSS,
-    DEFAULT_CONFIG,
-    DURATION,
-)
+from rollover.common import CDSS, DEFAULT_CONFIG, DURATION, alg, pytestmark, size
+
+import isctest
 
 
 @pytest.fixture(scope="module", autouse=True)
index 1dc112e643cc6bf16f9875a1d5e6d352039f0597..9f59ebc89f3a090b51ce986e0438c17b48842b0a 100644 (file)
 # pylint: disable=redefined-outer-name,unused-import
 
 from datetime import timedelta
-import os
 
-import pytest
+import os
 
 import dns
 import dns.update
+import pytest
 
-import isctest
 from isctest.kasp import Iret
 from isctest.run import EnvCmd
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-)
+from rollover.common import alg, pytestmark, size
 from rollover.setup import fake_lifetime, render_and_sign_zone
 
+import isctest
+
 
 def bootstrap():
     templates = isctest.template.TemplateEngine(".")
index c38e5ddd49134a651f4b3f08b75f2470043c5a70..c34d62aa2ccc603847e0b930b6a73fb8b18b97c1 100644 (file)
 
 import pytest
 
+from rollover.common import CDSS, DEFAULT_CONFIG, DURATION, alg, pytestmark, size
+from rollover.setup import configure_root, configure_straight2none, configure_tld
+
 import isctest
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    CDSS,
-    DURATION,
-    DEFAULT_CONFIG,
-)
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_straight2none,
-)
 
 
 def bootstrap():
index 5cfb49653b5fcb01eab0c74d30a8293c77f47908..2d8fbce2093a15866cc7cf11a18bd967463d4f19 100644 (file)
 
 import pytest
 
+from rollover.common import CDSS, DEFAULT_CONFIG, DURATION, alg, pytestmark, size
+from rollover.setup import configure_root, configure_straight2none, configure_tld
+
 import isctest
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    CDSS,
-    DURATION,
-    DEFAULT_CONFIG,
-)
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_straight2none,
-)
 
 
 def bootstrap():
index 31e0b99e43e6cf56481755ab42494ac8e7a52398..6daabfdf85fe652e67c2e11b91b9aef731869911 100644 (file)
@@ -15,20 +15,12 @@ from datetime import timedelta
 
 import pytest
 
-import isctest
 from isctest.kasp import Ipub, Iret
 from isctest.util import param
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    TIMEDELTA,
-)
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_zsk_prepub,
-)
+from rollover.common import TIMEDELTA, alg, pytestmark, size
+from rollover.setup import configure_root, configure_tld, configure_zsk_prepub
+
+import isctest
 
 CONFIG = {
     "dnskey-ttl": TIMEDELTA["PT1H"],
index 6fa054a1d75cc924fb3467ceeba2edeec193e8f0..64bd8f2afc9a75fb1094fa51ad5efe75b792e09a 100644 (file)
@@ -10,6 +10,7 @@
 # information regarding copyright ownership.
 
 from datetime import timedelta
+
 import os
 
 import pytest
index ed4b0d1289de69f556db028529a5b604c65b2bc0..42bdf6301797e18ac02c0d73298f42cafefe8465 100644 (file)
@@ -9,15 +9,17 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import shutil
 from typing import List
 
-import isctest
+import shutil
+
 from isctest.kasp import private_type_record
-from isctest.template import Nameserver, TrustAnchor, Zone
 from isctest.run import EnvCmd
+from isctest.template import Nameserver, TrustAnchor, Zone
 from rollover.common import default_algorithm
 
+import isctest
+
 
 def configure_tld(zonename: str, delegations: List[Zone]) -> Zone:
     templates = isctest.template.TemplateEngine(".")
index f2c9871f4d1117aaa373629480e9aa2b3adbb106..f319511bca74c59e127b80f72decfa1b52e07373 100644 (file)
 # information regarding copyright ownership.
 
 from datetime import timedelta
+
 import os
 
-import isctest
-from isctest.kasp import KeyTimingMetadata, Ipub, Iret, private_type_record
-from isctest.template import Nameserver, Zone
+from isctest.kasp import Ipub, Iret, KeyTimingMetadata, private_type_record
 from isctest.run import EnvCmd
-
+from isctest.template import Nameserver, Zone
 from rollover.common import default_algorithm
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-)
+from rollover.setup import configure_root, configure_tld
+
+import isctest
 
 
 def setup_zone(zone, ksk_time, ksk_settime, zsk_time, zsk_settime) -> Zone:
index dc2353d039a5f857742291ee9fb7314ea815d699..5eedc45e274a46193fa34eae7eec9a2ab9fb8372 100644 (file)
 
 import os
 
-import pytest
-
 import dns
 import dns.rcode
 import dns.rrset
+import pytest
 
 import isctest
 
index 90f76b8416ec699b231d7e3c72d8dd8257b79c53..671ca877518b596bf89f9341797c70ce43638a25 100755 (executable)
@@ -14,13 +14,15 @@ isctest.name.ZoneAnalyzer self-test
 Generate insane test zone and check expected output of ZoneAnalyzer utility class
 """
 
+from pathlib import Path
+
 import collections
 import itertools
-from pathlib import Path
+
+from dns.name import Name
 
 import dns
 import dns.name
-from dns.name import Name
 import pytest
 
 import isctest
index 2b5b9d522099fb512dcc067ced16a6416fe6e352..831f85c449f7a9ab4130baef78e2155d1f5b1f6c 100755 (executable)
 # information regarding copyright ownership.
 
 from concurrent.futures import ThreadPoolExecutor, as_completed
+from string import ascii_lowercase as letters
+
 import os
 import random
 import signal
 import subprocess
-from string import ascii_lowercase as letters
 import time
 
-import pytest
-
 import dns
 import dns.exception
+import pytest
 
 import isctest
 
index f5c68c86af8a845326711f7e32e9d37478d8c220..137334197e9a74a3d867ee4cdeefcbe8979af294 100644 (file)
@@ -10,7 +10,6 @@
 # information regarding copyright ownership.
 
 import dns.message
-
 import pytest
 
 import isctest
index 09a374e120798c66ce448fd67a6ec41bfb4537c5..3e317087ebd1059c2c3dcf61291401c2458ea61f 100644 (file)
@@ -9,9 +9,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-from datetime import datetime, timedelta
 from collections import defaultdict
+from datetime import datetime, timedelta
 from time import sleep
+
 import os
 
 import dns.message
index 1ceb46f9b4b68490c46311e801f644f93632e511..0707681de7f69c38896fa1e25e4745abe07e6ede 100755 (executable)
@@ -12,6 +12,7 @@
 # information regarding copyright ownership.
 
 from datetime import datetime
+
 import xml.etree.ElementTree as ET
 
 import pytest
index 25ee0d0e1bf42abb51f03a79f400ecd6fc4e6d04..c8b301f8a87225869980affeaa9245a1ddfea1f0 100644 (file)
@@ -17,11 +17,10 @@ import socket
 import struct
 import time
 
-import pytest
-
 import dns
 import dns.message
 import dns.query
+import pytest
 
 pytestmark = pytest.mark.extra_artifacts(
     [
index 2c0da8514a320bae5526ab62670c9f6fcc4c5a2b..ceea7c0a00c9dbebeb3a503ae492560624038307 100644 (file)
@@ -16,8 +16,6 @@
 import socket
 import time
 
-import pytest
-
 import dns
 import dns.edns
 import dns.message
@@ -25,6 +23,7 @@ import dns.name
 import dns.query
 import dns.rdataclass
 import dns.rdatatype
+import pytest
 
 import isctest.mark
 
index 93670bc48cada6db2205060ab4a78d14d2285092..d1dd1de053ac7b69642193f11bd216ec7c163233 100644 (file)
 import os
 import subprocess
 
+from dns.dnssectypes import NSEC3Hash
+from hypothesis import given, settings, strategies
+
+import dns.dnssec
 import pytest
 
-import isctest
 from isctest.hypothesis.strategies import dns_names
 
-from hypothesis import strategies, given, settings
-
-from dns.dnssectypes import NSEC3Hash
-import dns.dnssec
+import isctest
 
 NSEC3HASH = os.environ.get("NSEC3HASH")
 
index 4c3a62c9d85f6d034bf726426cbb28d81fa9681c..60a47f55cbe4c854b2464a06de82a2dff616b9e5 100644 (file)
 import socket
 import time
 
-import pytest
-
 import dns.message
 import dns.query
 import dns.tsigkeyring
+import pytest
 
 pytestmark = pytest.mark.extra_artifacts(
     [
index 5d31b58339cbac66388150e4bc2b949af6b9f7c9..a7107c87fc7ed68f4ec67499b81968b01bad2313 100644 (file)
@@ -17,7 +17,8 @@
 
 import time
 
-import pytest
+from hypothesis import assume, example, given
+from hypothesis.strategies import binary, booleans, composite, just, sampled_from
 
 import dns.exception
 import dns.message
@@ -27,12 +28,11 @@ import dns.rdatatype
 import dns.rdtypes.ANY.TSIG
 import dns.rrset
 import dns.tsig
+import pytest
 
-import isctest
 from isctest.hypothesis.strategies import dns_names, uint
 
-from hypothesis import assume, example, given
-from hypothesis.strategies import binary, booleans, composite, just, sampled_from
+import isctest
 
 pytestmark = pytest.mark.extra_artifacts(
     [
index 7e960ba6e1c26d51e2bdd99de05649d1a543987f..01e86e0fa9b4d56b0831904aa2077a4816d9224c 100755 (executable)
@@ -20,10 +20,6 @@ import argparse
 import struct
 import time
 
-import pytest
-
-import isctest
-
 import dns
 import dns.message
 import dns.name
@@ -31,6 +27,9 @@ import dns.rdata
 import dns.rdataclass
 import dns.rdatatype
 import dns.rrset
+import pytest
+
+import isctest
 
 pytestmark = pytest.mark.extra_artifacts(
     [
index e5e780a5324921e924a7006ef5a9f925b9d0d44a..2fe4d30b2fd116d56cfcaa3dbe8e3a8369f9b514 100644 (file)
@@ -9,9 +9,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+from re import compile as Re
+
 import os
 import re
-from re import compile as Re
 
 import pytest
 
index 60d75384f03d998a1c05a99576a7f5e38ae16f1c..dfe0dc831488504c97dcf5da8db1ef46c5f02621 100755 (executable)
@@ -31,7 +31,7 @@ Limitations - untested properties:
 # https://github.com/pylint-dev/pylint/issues/10785#issuecomment-3677224217
 # pylint: disable=unreachable
 
-import pytest
+from hypothesis import assume, example, given, settings
 
 import dns
 import dns.message
@@ -41,9 +41,9 @@ import dns.rcode
 import dns.rdataclass
 import dns.rdatatype
 import dns.rrset
+import pytest
 
 from isctest.hypothesis.strategies import dns_names, dns_rdatatypes_without_meta
-from hypothesis import assume, example, given, settings
 
 import isctest.check
 import isctest.name
index 6f5346ff86c1243c1fd9bc9f617080b80220567a..d162070c76a56fcd7c1fc41f50055987d5b9bccd 100644 (file)
@@ -9,10 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-from isctest.asyncserver import (
-    AsyncDnsServer,
-    IgnoreAllQueries,
-)
+from isctest.asyncserver import AsyncDnsServer, IgnoreAllQueries
 
 
 def main() -> None:
index 2e3a1f8be221fa20f636ff3236aa922521f3008d..269afafe228018759dfd62c866b2e891c02a6bbb 100644 (file)
@@ -19,10 +19,10 @@ import dns.rrset
 
 from isctest.asyncserver import (
     ControllableAsyncDnsServer,
+    DnsResponseSend,
     DomainHandler,
     QueryContext,
     ResponseAction,
-    DnsResponseSend,
     ToggleResponsesCommand,
 )
 
index 591e2ffab02e65963ee1a8b2d3749dbc96b83a24..4f4aa058e248ddbc691d25bef5a19aea8f20087a 100644 (file)
 # information regarding copyright ownership.
 
 
+from re import compile as Re
+
 import fileinput
 import os
-from re import compile as Re
 import socket
 import time
 
+import dns.message
 import pytest
 
-import isctest
 from isctest.util import param
 
-import dns.message
+import isctest
 
 NEW_SOA_SERIAL = 1397051953
 OLD_SOA_SERIAL = 1397051952
index a0d042d1356e1f5572eceedd336462e64690a46e..ba599471d5d4150db7639b84a0d621bd87280267 100644 (file)
@@ -9,10 +9,11 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+from re import compile as Re
+
 import glob
 import os
 import re
-from re import compile as Re
 import shutil
 import signal
 import time
index a7f63913cf8985cad408b2c4dfe0c7e16f5132ef..ad4a4e3ffdac901e04da353c5d0b5e41700c9554 100644 (file)
@@ -11,9 +11,10 @@ See the COPYRIGHT file distributed with this work for additional
 information regarding copyright ownership.
 """
 
-import ipaddress
 from typing import AsyncGenerator
 
+import ipaddress
+
 import dns.rcode
 import dns.rdatatype
 import dns.rrset
index 06ade1426924ca6573d92fee65812f7ef686acf6..0fe566a5482b2e48146e9eba8f0e807c6777128b 100644 (file)
@@ -23,9 +23,8 @@ https://www.sphinx-doc.org/en/master/development/tutorials/recipe.html
 
 from collections import namedtuple
 
-from docutils.parsers.rst import Directive, directives
 from docutils import nodes
-
+from docutils.parsers.rst import Directive, directives
 from sphinx import addnodes
 from sphinx.directives import ObjectDescription
 from sphinx.domains import Domain
index b0500eb4b5bd11c5775b3ad81529761f65f1622c..b18e1e162637b63b065e525dfc79dbff0e32c725 100644 (file)
 
 # Depends on CWD - Sphinx plugin
 
-import json
 from pathlib import Path
 
+import json
+
 import parsegrammar
 
 
index 09984eceb450624c4c8a74b282d26a0f37cda95c..f08c1e43dda0a3a9c119a2e06472d8fe026d8cfd 100644 (file)
@@ -20,6 +20,7 @@ vs. '( unlimited | <duration> ) used in options.
 
 from collections import namedtuple
 from itertools import groupby
+
 import fileinput
 
 import parsegrammar
index 9946ac8df80bce4053e9f221cb7530d791052cce..bb87900d7e0af142e9a3a218831a8d5399143cf9 100644 (file)
@@ -90,6 +90,8 @@ ignore_names = [
 [tool.ruff]
 target-version = "py310"
 lint.select = [
+  # import order
+  "I",
   # f-strings
   "UP031",
   "UP032",
@@ -101,3 +103,12 @@ extend-exclude = [
   "doc/arm/conf.py",
   "doc/man/conf.py",
 ]
+src = [
+  "bin/tests/system",
+  "doc/misc",
+  "doc/arm/_ext",
+]
+[tool.ruff.lint.isort]
+from-first = true
+lines-between-types = 1
+split-on-trailing-comma = false