Remove superfluous 'pylint: disable' directives

Some of these have been fixed already, fix the rest.
2026-06-15 00:10:04 -04:00 · 2026-02-09 15:10:36 +01:00 · 2026-02-09 15:10:36 +01:00 · 08f5e5ebd1
commit 08f5e5ebd1
parent b00f16f026
36 changed files with 3 additions and 76 deletions
--- a/bin/tests/system/digdelv/yamlget.py
+++ b/bin/tests/system/digdelv/yamlget.py
@ -13,8 +13,7 @@ import sys

 try:
    import yaml
-# pylint: disable=bare-except
-except:
+except ImportError:
    print("No python yaml module, skipping")
    sys.exit(1)

--- a/bin/tests/system/doth/stress_http_quota.py
+++ b/bin/tests/system/doth/stress_http_quota.py
@ -135,9 +135,8 @@ class SubDIG:
        return command

    def run(self):
-        # pylint: disable=consider-using-with
        with open(os.devnull, "w", encoding="utf-8") as devnull:
-            self.sub_process = subprocess.Popen(
+            self.sub_process = subprocess.Popen(  # pylint: disable=consider-using-with
                self.get_command(), shell=True, stdout=devnull
            )

--- a/bin/tests/system/isctest/vars/all.py
+++ b/bin/tests/system/isctest/vars/all.py
@ -11,11 +11,8 @@

 from collections import ChainMap

-# pylint: enable=import-error
 from .algorithms import ALG_VARS, CRYPTO_SUPPORTED_VARS
 from .basic import BASIC_VARS
-
-# pylint: disable=import-error
 from .build import BUILD_VARS  # type: ignore
 from .dirs import DIR_VARS
 from .features import FEATURE_VARS
--- a/bin/tests/system/isctest/vars/basic.py
+++ b/bin/tests/system/isctest/vars/basic.py
@ -11,12 +11,8 @@

 import os

-# pylint: disable=import-error
 from .build import BUILD_VARS  # type: ignore

-# pylint: enable=import-error
-
-
 BASIC_VARS = {
    "ARPANAME": f"{BUILD_VARS['TOP_BUILDDIR']}/arpaname",
    "CDS": f"{BUILD_VARS['TOP_BUILDDIR']}/dnssec-cds",
--- a/bin/tests/system/isctest/vars/dirs.py
+++ b/bin/tests/system/isctest/vars/dirs.py
@ -11,12 +11,8 @@

 import os

-# pylint: disable=import-error
 from .build import BUILD_VARS, SYSTEM_TEST_DIR_GIT_PATH  # type: ignore

-# pylint: enable=import-error
-
-
 DIR_VARS = {
    "builddir": f"{BUILD_VARS['TOP_BUILDDIR']}/{SYSTEM_TEST_DIR_GIT_PATH}",
    "srcdir": f"{BUILD_VARS['TOP_SRCDIR']}/{SYSTEM_TEST_DIR_GIT_PATH}",
--- a/bin/tests/system/keyfromlabel/tests_keyfromlabel.py
+++ b/bin/tests/system/keyfromlabel/tests_keyfromlabel.py
@ -86,7 +86,6 @@ def token_init_and_cleanup():
        assert Re("Found token (.*) with matching token label") in cmd.out


-# pylint: disable-msg=too-many-locals
@pytest.mark.parametrize(
    "alg_name,alg_type,alg_bits",
    [
--- a/bin/tests/system/ksr/tests_ksr.py
+++ b/bin/tests/system/ksr/tests_ksr.py
@ -509,7 +509,6 @@ def check_signedkeyresponse(
                # collect keys that should be in this bundle
                # collect lines that should be in this bundle
                bundle_keys.append(key)
-                # pylint: disable=unused-variable
                for _arg in expected_cds:
                    bundle_lines.append(lines[line_no])
                    line_no += 1
--- a/bin/tests/system/nsec3/tests_nsec3_change.py
+++ b/bin/tests/system/nsec3/tests_nsec3_change.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 import shutil
 import time

--- a/bin/tests/system/nsec3/tests_nsec3_initial.py
+++ b/bin/tests/system/nsec3/tests_nsec3_initial.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 import os

 import dns
--- a/bin/tests/system/nsec3/tests_nsec3_reconfig.py
+++ b/bin/tests/system/nsec3/tests_nsec3_reconfig.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 import os
 import time

--- a/bin/tests/system/nsec3/tests_nsec3_reload.py
+++ b/bin/tests/system/nsec3/tests_nsec3_reload.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 import shutil

 from nsec3.common import NSEC3_MARK, check_nsec3_case
--- a/bin/tests/system/nsec3/tests_nsec3_restart.py
+++ b/bin/tests/system/nsec3/tests_nsec3_restart.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 import os

 import dns
--- a/bin/tests/system/nsec3/tests_nsec3_retransfer.py
+++ b/bin/tests/system/nsec3/tests_nsec3_retransfer.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 from datetime import timedelta

 import os
--- a/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_initial.py
+++ b/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_initial.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 import pytest

 from isctest.util import param
--- a/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_reconfig.py
+++ b/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_reconfig.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 import pytest

 from isctest.kasp import KeyTimingMetadata
--- a/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_initial.py
+++ b/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_initial.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=unused-import
-
 import pytest

 from isctest.util import param
--- a/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_reconfig.py
+++ b/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_reconfig.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 import pytest

 from isctest.kasp import KeyTimingMetadata
--- a/bin/tests/system/rollover-csk-roll1/tests_rollover_csk_roll1.py
+++ b/bin/tests/system/rollover-csk-roll1/tests_rollover_csk_roll1.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 from datetime import timedelta

 import pytest
--- a/bin/tests/system/rollover-csk-roll2/tests_rollover_csk_roll2.py
+++ b/bin/tests/system/rollover-csk-roll2/tests_rollover_csk_roll2.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 from datetime import timedelta

 import pytest
--- a/bin/tests/system/rollover-dynamic2inline/tests_rollover_dynamic2inline.py
+++ b/bin/tests/system/rollover-dynamic2inline/tests_rollover_dynamic2inline.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 from rollover.common import CDSS, DEFAULT_CONFIG, ROLLOVER_MARK

 import isctest
--- a/bin/tests/system/rollover-enable-dnssec/tests_rollover_enable_dnssec.py
+++ b/bin/tests/system/rollover-enable-dnssec/tests_rollover_enable_dnssec.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 import pytest

 from isctest.kasp import Ipub, IpubC, Iret
--- a/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_initial.py
+++ b/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_initial.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 import pytest

 from rollover.common import CDSS, DURATION, ROLLOVER_MARK, UNSIGNING_CONFIG
--- a/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_reconfig.py
+++ b/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_reconfig.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 import pytest

 from rollover.common import (
--- a/bin/tests/system/rollover-ksk-3crowd/tests_rollover_three_is_a_crowd.py
+++ b/bin/tests/system/rollover-ksk-3crowd/tests_rollover_three_is_a_crowd.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 from datetime import timedelta

 from isctest.kasp import KeyTimingMetadata
--- a/bin/tests/system/rollover-ksk-doubleksk/tests_rollover_ksk_doubleksk.py
+++ b/bin/tests/system/rollover-ksk-doubleksk/tests_rollover_ksk_doubleksk.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 from datetime import timedelta

 import pytest
--- a/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_initial.py
+++ b/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_initial.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 import pytest

 from isctest.util import param
--- a/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_reconfig.py
+++ b/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_reconfig.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 import pytest

 from isctest.util import param
--- a/bin/tests/system/rollover-multisigner/tests_rollover_multisigner.py
+++ b/bin/tests/system/rollover-multisigner/tests_rollover_multisigner.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 from datetime import timedelta

 import os
--- a/bin/tests/system/rollover-straight2none/tests_rollover_straight2none_initial.py
+++ b/bin/tests/system/rollover-straight2none/tests_rollover_straight2none_initial.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 import pytest

 from rollover.common import CDSS, DEFAULT_CONFIG, DURATION, ROLLOVER_MARK
--- a/bin/tests/system/rollover-straight2none/tests_rollover_straight2none_reconfig.py
+++ b/bin/tests/system/rollover-straight2none/tests_rollover_straight2none_reconfig.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 import pytest

 from rollover.common import CDSS, DEFAULT_CONFIG, DURATION, ROLLOVER_MARK
--- a/bin/tests/system/rollover-zsk-prepub/tests_rollover_zsk_prepublication.py
+++ b/bin/tests/system/rollover-zsk-prepub/tests_rollover_zsk_prepublication.py
@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=redefined-outer-name,unused-import
-
 from datetime import timedelta

 import pytest
--- a/bin/tests/system/tcp/tests_tcp.py
+++ b/bin/tests/system/tcp/tests_tcp.py
@ -11,8 +11,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=unused-variable
-
 import socket
 import struct
 import time
--- a/bin/tests/system/timeouts/tests_tcp_timeouts.py
+++ b/bin/tests/system/timeouts/tests_tcp_timeouts.py
@ -11,8 +11,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=unused-variable
-
 import socket
 import time

@ -25,7 +23,7 @@ import dns.rdataclass
 import dns.rdatatype
 import pytest

-import isctest.mark  # pylint: disable=import-error
+import isctest.mark

 pytestmark = pytest.mark.extra_artifacts(
    [
--- a/bin/tests/system/tsig/tests_badtime.py
+++ b/bin/tests/system/tsig/tests_badtime.py
@ -11,8 +11,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# pylint: disable=unused-variable
-
 import socket
 import time

--- a/doc/arm/conf.py
+++ b/doc/arm/conf.py
@ -146,7 +146,6 @@ sys.path.append(str(Path(__file__).resolve().parent.parent / "misc"))
 # -- Project information -----------------------------------------------------

 project = "BIND 9"
-# pylint: disable=redefined-builtin
 copyright = "2023, Internet Systems Consortium"
 author = "Internet Systems Consortium"

--- a/doc/man/conf.py
+++ b/doc/man/conf.py
@ -35,11 +35,9 @@ sys.path.append(str(Path(__file__).resolve().parent.parent / "misc"))
 # -- Project information -----------------------------------------------------

 project = "BIND 9"
-# pylint: disable=wrong-import-position
 import datetime

 year = datetime.datetime.now().year
-# pylint: disable=redefined-builtin
 copyright = "%d, Internet Systems Consortium" % year
 author = "Internet Systems Consortium"

@ -67,7 +65,6 @@ exclude_patterns = [
 # The master toctree document.
 master_doc = "index"

-# pylint: disable=line-too-long
 man_pages = [
    (
        "arpaname",