From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 6 Nov 2025 12:21:48 +0000 (-0500) Subject: chore: Remove first set of unused imports X-Git-Tag: rec-5.4.0-alpha1~56^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d050f28d98e2f19ce5b22a80aae2f82165d38122;p=thirdparty%2Fpdns.git chore: Remove first set of unused imports Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- diff --git a/docs/conf.py b/docs/conf.py index b8cbbc8bbb..bb67aaeb94 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -22,7 +22,6 @@ import glob import sys from pathlib import Path import guzzle_sphinx_theme -import datetime # -- General configuration ------------------------------------------------ diff --git a/docs/depfile.py b/docs/depfile.py index fda8ba8340..548b71a6f9 100644 --- a/docs/depfile.py +++ b/docs/depfile.py @@ -11,7 +11,6 @@ an external build system""" import os -import sphinx import sys from pathlib import Path diff --git a/modules/remotebackend/pdns_unittest.py b/modules/remotebackend/pdns_unittest.py index 469c545a48..387dc567a9 100644 --- a/modules/remotebackend/pdns_unittest.py +++ b/modules/remotebackend/pdns_unittest.py @@ -1,6 +1,4 @@ import pdns.remotebackend -import sys -import io import time diff --git a/modules/remotebackend/regression-tests/zeromq-backend.py b/modules/remotebackend/regression-tests/zeromq-backend.py index ff12670f1f..c3bb1c60c9 100755 --- a/modules/remotebackend/regression-tests/zeromq-backend.py +++ b/modules/remotebackend/regression-tests/zeromq-backend.py @@ -3,7 +3,6 @@ import zmq import json import os -from urllib.parse import parse_qs, urlparse from backend import BackendHandler def run(socket, handler): diff --git a/modules/remotebackend/unittest_pipe.py b/modules/remotebackend/unittest_pipe.py index 52c1c6c4fc..6b6752d433 100755 --- a/modules/remotebackend/unittest_pipe.py +++ b/modules/remotebackend/unittest_pipe.py @@ -2,7 +2,6 @@ from pdns_unittest import Handler from pdns.remotebackend import PipeConnector -import os connector = PipeConnector(Handler) connector.run() diff --git a/modules/remotebackend/unittest_zeromq.py b/modules/remotebackend/unittest_zeromq.py index 62b5f968ce..4300b1e46a 100755 --- a/modules/remotebackend/unittest_zeromq.py +++ b/modules/remotebackend/unittest_zeromq.py @@ -3,7 +3,6 @@ import zmq import json import os -from urllib.parse import parse_qs, urlparse from pdns_unittest import Handler def run(socket, handler): diff --git a/pdns/dnsdistdist/docs/conf.py b/pdns/dnsdistdist/docs/conf.py index fe342f01e3..b1de3020f4 100644 --- a/pdns/dnsdistdist/docs/conf.py +++ b/pdns/dnsdistdist/docs/conf.py @@ -22,7 +22,6 @@ # sys.path.insert(0, os.path.abspath('.')) import sys from pathlib import Path -import datetime # -- General configuration ------------------------------------------------ diff --git a/pdns/recursordist/docs/conf.py b/pdns/recursordist/docs/conf.py index d0188e72f0..237ea32eb2 100644 --- a/pdns/recursordist/docs/conf.py +++ b/pdns/recursordist/docs/conf.py @@ -21,7 +21,6 @@ import sys from pathlib import Path import guzzle_sphinx_theme -import datetime # -- General configuration ------------------------------------------------ diff --git a/regression-tests.api/test_Cache.py b/regression-tests.api/test_Cache.py index 86b1c2f389..928d12ecd6 100644 --- a/regression-tests.api/test_Cache.py +++ b/regression-tests.api/test_Cache.py @@ -1,4 +1,4 @@ -from test_helper import ApiTestCase, is_auth, is_recursor, sdig +from test_helper import ApiTestCase, is_recursor, sdig import unittest diff --git a/regression-tests.api/test_TSIG.py b/regression-tests.api/test_TSIG.py index 83b99587a5..09c0741a81 100644 --- a/regression-tests.api/test_TSIG.py +++ b/regression-tests.api/test_TSIG.py @@ -1,10 +1,7 @@ from __future__ import print_function import json -import time import unittest -from copy import deepcopy -from pprint import pprint -from test_helper import ApiTestCase, unique_tsigkey_name, is_auth, is_recursor +from test_helper import ApiTestCase, unique_tsigkey_name, is_auth class AuthTSIGHelperMixin(object): def create_tsig_key(self, name=None, algorithm='hmac-md5', key=None): diff --git a/regression-tests.api/test_Views.py b/regression-tests.api/test_Views.py index e179c01cd2..c8719bc414 100644 --- a/regression-tests.api/test_Views.py +++ b/regression-tests.api/test_Views.py @@ -1,11 +1,9 @@ # this tests Networks and Views -import subprocess import json import unittest -import os -from test_helper import ApiTestCase, is_auth, is_auth_lmdb, pdnsutil +from test_helper import ApiTestCase, is_auth, is_auth_lmdb from test_Zones import AuthZonesHelperMixin @unittest.skipIf(not is_auth(), "Not applicable") diff --git a/regression-tests.api/test_Zones.py b/regression-tests.api/test_Zones.py index 4afd6533b1..3a067d5c51 100644 --- a/regression-tests.api/test_Zones.py +++ b/regression-tests.api/test_Zones.py @@ -3,7 +3,6 @@ import json import operator import time import unittest -import requests.exceptions from copy import deepcopy from parameterized import parameterized from pprint import pprint diff --git a/regression-tests.api/test_cryptokeys.py b/regression-tests.api/test_cryptokeys.py index 34c600ec5d..848b296d38 100644 --- a/regression-tests.api/test_cryptokeys.py +++ b/regression-tests.api/test_cryptokeys.py @@ -1,7 +1,5 @@ -import subprocess import json import unittest -import os from test_helper import ApiTestCase, is_auth, pdnsutil, unique_zone_name diff --git a/regression-tests.auth-py/authtests.py b/regression-tests.auth-py/authtests.py index f308d49bd7..79db020e49 100644 --- a/regression-tests.auth-py/authtests.py +++ b/regression-tests.auth-py/authtests.py @@ -13,7 +13,6 @@ import unittest import dns import dns.message -from pprint import pprint from eqdnsmessage import AssertEqualDNSMessageMixin class AuthTest(AssertEqualDNSMessageMixin, unittest.TestCase): diff --git a/regression-tests.auth-py/test_ALIAS.py b/regression-tests.auth-py/test_ALIAS.py index 441ffa49e4..766e3e831e 100644 --- a/regression-tests.auth-py/test_ALIAS.py +++ b/regression-tests.auth-py/test_ALIAS.py @@ -3,7 +3,6 @@ from __future__ import print_function import threading -import unittest import clientsubnetoption import dns diff --git a/regression-tests.auth-py/test_AuthSignal.py b/regression-tests.auth-py/test_AuthSignal.py index 1b87d0e8ad..d1a474b34f 100644 --- a/regression-tests.auth-py/test_AuthSignal.py +++ b/regression-tests.auth-py/test_AuthSignal.py @@ -2,7 +2,6 @@ import dns import os -import pytest from authtests import AuthTest diff --git a/regression-tests.auth-py/test_Carbon.py b/regression-tests.auth-py/test_Carbon.py index 18d6e23f7c..9bbea2f02f 100644 --- a/regression-tests.auth-py/test_Carbon.py +++ b/regression-tests.auth-py/test_Carbon.py @@ -3,7 +3,6 @@ import threading import socket import sys import time -import os from queue import Queue from authtests import AuthTest diff --git a/regression-tests.auth-py/test_GSSTSIG.py b/regression-tests.auth-py/test_GSSTSIG.py index cfae4d8863..f6df803568 100644 --- a/regression-tests.auth-py/test_GSSTSIG.py +++ b/regression-tests.auth-py/test_GSSTSIG.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -import dns import os import subprocess diff --git a/regression-tests.auth-py/test_LuaRecords.py b/regression-tests.auth-py/test_LuaRecords.py index b79b7c6a9d..731b45e87c 100644 --- a/regression-tests.auth-py/test_LuaRecords.py +++ b/regression-tests.auth-py/test_LuaRecords.py @@ -1,6 +1,5 @@ #!/usr/bin/env python import unittest -import requests import threading import dns import time diff --git a/regression-tests.auth-py/test_LuaRecordsLMDB.py b/regression-tests.auth-py/test_LuaRecordsLMDB.py index 633704da47..beffea331b 100644 --- a/regression-tests.auth-py/test_LuaRecordsLMDB.py +++ b/regression-tests.auth-py/test_LuaRecordsLMDB.py @@ -1,8 +1,6 @@ #!/usr/bin/env python import unittest import dns -import os -import subprocess from authtests import AuthTest diff --git a/regression-tests.auth-py/test_ProxyProtocol.py b/regression-tests.auth-py/test_ProxyProtocol.py index 8a03ab4844..d5b6636d97 100644 --- a/regression-tests.auth-py/test_ProxyProtocol.py +++ b/regression-tests.auth-py/test_ProxyProtocol.py @@ -4,9 +4,6 @@ import os import socket import struct import subprocess -import threading -import time -import unittest from authtests import AuthTest from proxyprotocol import ProxyProtocol diff --git a/regression-tests.auth-py/test_XFRIncomplete.py b/regression-tests.auth-py/test_XFRIncomplete.py index efe10059d0..ac06abeba7 100644 --- a/regression-tests.auth-py/test_XFRIncomplete.py +++ b/regression-tests.auth-py/test_XFRIncomplete.py @@ -1,7 +1,5 @@ import dns -import json import os -import requests import socket import struct import sys diff --git a/regression-tests.dnsdist/dnsdistdohtests.py b/regression-tests.dnsdist/dnsdistdohtests.py index 57f0c54879..ad44b2f53c 100644 --- a/regression-tests.dnsdist/dnsdistdohtests.py +++ b/regression-tests.dnsdist/dnsdistdohtests.py @@ -1,13 +1,9 @@ #!/usr/bin/env python -import base64 -import dns import os import unittest from dnsdisttests import DNSDistTest -import pycurl -from io import BytesIO @unittest.skipIf('SKIP_DOH_TESTS' in os.environ, 'DNS over HTTPS tests are disabled') class DNSDistDOHTest(DNSDistTest): diff --git a/regression-tests.dnsdist/doh3client.py b/regression-tests.dnsdist/doh3client.py index 15e6d79479..7d914303ee 100644 --- a/regression-tests.dnsdist/doh3client.py +++ b/regression-tests.dnsdist/doh3client.py @@ -1,22 +1,18 @@ import base64 import copy import asyncio -import pickle -import ssl -import struct import dns import time import async_timeout from collections import deque -from typing import BinaryIO, Callable, Deque, Dict, List, Optional, Tuple, Union, cast +from typing import Deque, Dict, Optional, Tuple, Union, cast from urllib.parse import urlparse -import aioquic from aioquic.asyncio.client import connect from aioquic.asyncio.protocol import QuicConnectionProtocol -from aioquic.h0.connection import H0_ALPN, H0Connection -from aioquic.h3.connection import H3_ALPN, ErrorCode, H3Connection +from aioquic.h0.connection import H0Connection +from aioquic.h3.connection import H3_ALPN, H3Connection from aioquic.h3.events import ( DataReceived, H3Event, @@ -24,8 +20,7 @@ from aioquic.h3.events import ( PushPromiseReceived, ) from aioquic.quic.configuration import QuicConfiguration -from aioquic.quic.events import QuicEvent, StreamDataReceived, StreamReset -from aioquic.tls import CipherSuite, SessionTicket +from aioquic.quic.events import QuicEvent, StreamReset from doqclient import StreamResetError diff --git a/regression-tests.dnsdist/doqclient.py b/regression-tests.dnsdist/doqclient.py index 7fa416d237..373e0516e1 100644 --- a/regression-tests.dnsdist/doqclient.py +++ b/regression-tests.dnsdist/doqclient.py @@ -1,8 +1,6 @@ import asyncio -import pickle -import ssl import struct -from typing import Any, Optional, cast +from typing import Any, cast import dns import dns.message import async_timeout @@ -12,7 +10,6 @@ from aioquic.asyncio.client import connect from aioquic.asyncio.protocol import QuicConnectionProtocol from aioquic.quic.configuration import QuicConfiguration from aioquic.quic.events import QuicEvent, StreamDataReceived, StreamReset -from aioquic.quic.logger import QuicFileLogger class DnsClientProtocol(QuicConnectionProtocol): def __init__(self, *args, **kwargs): diff --git a/regression-tests.dnsdist/test_CacheInsertedResponses.py b/regression-tests.dnsdist/test_CacheInsertedResponses.py index d42de120c3..1290eb1711 100644 --- a/regression-tests.dnsdist/test_CacheInsertedResponses.py +++ b/regression-tests.dnsdist/test_CacheInsertedResponses.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -import base64 -import time import dns from dnsdisttests import DNSDistTest diff --git a/regression-tests.dnsdist/test_CacheMissActions.py b/regression-tests.dnsdist/test_CacheMissActions.py index 9b25ccea07..deae1300c3 100644 --- a/regression-tests.dnsdist/test_CacheMissActions.py +++ b/regression-tests.dnsdist/test_CacheMissActions.py @@ -1,6 +1,5 @@ #!/usr/bin/env python import base64 -import time import dns from dnsdisttests import DNSDistTest, pickAvailablePort diff --git a/regression-tests.dnsdist/test_CachePadding.py b/regression-tests.dnsdist/test_CachePadding.py index 3dc969d4e1..a3c4823817 100644 --- a/regression-tests.dnsdist/test_CachePadding.py +++ b/regression-tests.dnsdist/test_CachePadding.py @@ -2,7 +2,7 @@ import dns import paddingoption import randompaddingoption -from dnsdisttests import DNSDistTest, pickAvailablePort +from dnsdisttests import DNSDistTest class TestCachePadding(DNSDistTest): diff --git a/regression-tests.dnsdist/test_DNSParser.py b/regression-tests.dnsdist/test_DNSParser.py index 6a3f7c7ee6..6ef94bf28d 100644 --- a/regression-tests.dnsdist/test_DNSParser.py +++ b/regression-tests.dnsdist/test_DNSParser.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -import unittest import dns from dnsdisttests import DNSDistTest diff --git a/regression-tests.dnsdist/test_DOH3.py b/regression-tests.dnsdist/test_DOH3.py index 7be169a9f1..8ee9ed85d4 100644 --- a/regression-tests.dnsdist/test_DOH3.py +++ b/regression-tests.dnsdist/test_DOH3.py @@ -1,11 +1,9 @@ #!/usr/bin/env python import dns -import clientsubnetoption from dnsdisttests import DNSDistTest from dnsdisttests import pickAvailablePort -from quictests import QUICTests, QUICWithCacheTests, QUICACLTests, QUICGetLocalAddressOnAnyBindTests, QUICXFRTests -import doh3client +from quictests import QUICTests, QUICACLTests, QUICGetLocalAddressOnAnyBindTests, QUICXFRTests class TestDOH3(QUICTests, DNSDistTest): _serverKey = 'server.key' diff --git a/regression-tests.dnsdist/test_DOQ.py b/regression-tests.dnsdist/test_DOQ.py index c4d70ed178..ff2e0d717f 100644 --- a/regression-tests.dnsdist/test_DOQ.py +++ b/regression-tests.dnsdist/test_DOQ.py @@ -1,7 +1,6 @@ #!/usr/bin/env python import base64 import dns -import clientsubnetoption from dnsdisttests import DNSDistTest from dnsdisttests import pickAvailablePort diff --git a/regression-tests.dnsdist/test_DynBlocks.py b/regression-tests.dnsdist/test_DynBlocks.py index c7efc7c1d5..1361cb2613 100644 --- a/regression-tests.dnsdist/test_DynBlocks.py +++ b/regression-tests.dnsdist/test_DynBlocks.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -import base64 -import socket import time import dns from dnsdisttests import DNSDistTest diff --git a/regression-tests.dnsdist/test_DynBlocksEBPF.py b/regression-tests.dnsdist/test_DynBlocksEBPF.py index e53795cfa2..bf23f33edd 100644 --- a/regression-tests.dnsdist/test_DynBlocksEBPF.py +++ b/regression-tests.dnsdist/test_DynBlocksEBPF.py @@ -1,8 +1,6 @@ #!/usr/bin/env python -import dns import os import unittest -from dnsdisttests import DNSDistTest from dnsdistDynBlockTests import DynBlocksTest @unittest.skipUnless('ENABLE_SUDO_TESTS' in os.environ, "sudo is not available") diff --git a/regression-tests.dnsdist/test_DynBlocksGroup.py b/regression-tests.dnsdist/test_DynBlocksGroup.py index 3e2021ca71..e0ec591147 100644 --- a/regression-tests.dnsdist/test_DynBlocksGroup.py +++ b/regression-tests.dnsdist/test_DynBlocksGroup.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -import base64 import socket import time import dns diff --git a/regression-tests.dnsdist/test_DynBlocksRatio.py b/regression-tests.dnsdist/test_DynBlocksRatio.py index 8b4585f264..560ac857f9 100644 --- a/regression-tests.dnsdist/test_DynBlocksRatio.py +++ b/regression-tests.dnsdist/test_DynBlocksRatio.py @@ -1,10 +1,7 @@ #!/usr/bin/env python -import base64 -import socket import time import dns -from dnsdisttests import DNSDistTest -from dnsdistDynBlockTests import DynBlocksTest, waitForMaintenanceToRun, _maintenanceWaitTime +from dnsdistDynBlockTests import DynBlocksTest, waitForMaintenanceToRun class TestDynBlockGroupServFailsRatio(DynBlocksTest): diff --git a/regression-tests.dnsdist/test_DynBlocksResponseBytes.py b/regression-tests.dnsdist/test_DynBlocksResponseBytes.py index c4fdfa3abd..69cd956cac 100644 --- a/regression-tests.dnsdist/test_DynBlocksResponseBytes.py +++ b/regression-tests.dnsdist/test_DynBlocksResponseBytes.py @@ -1,10 +1,7 @@ #!/usr/bin/env python import base64 -import socket -import time -import dns from dnsdisttests import DNSDistTest -from dnsdistDynBlockTests import DynBlocksTest, waitForMaintenanceToRun, _maintenanceWaitTime +from dnsdistDynBlockTests import DynBlocksTest class TestDynBlockResponseBytes(DynBlocksTest): diff --git a/regression-tests.dnsdist/test_DynBlocksServFail.py b/regression-tests.dnsdist/test_DynBlocksServFail.py index 6bd1302c3c..e016b29851 100644 --- a/regression-tests.dnsdist/test_DynBlocksServFail.py +++ b/regression-tests.dnsdist/test_DynBlocksServFail.py @@ -1,10 +1,7 @@ #!/usr/bin/env python -import base64 -import socket import time import dns -from dnsdisttests import DNSDistTest -from dnsdistDynBlockTests import DynBlocksTest, waitForMaintenanceToRun, _maintenanceWaitTime +from dnsdistDynBlockTests import DynBlocksTest, waitForMaintenanceToRun class TestDynBlockServFails(DynBlocksTest): diff --git a/regression-tests.dnsdist/test_EDE.py b/regression-tests.dnsdist/test_EDE.py index 2e892176b4..7f8b29aa07 100644 --- a/regression-tests.dnsdist/test_EDE.py +++ b/regression-tests.dnsdist/test_EDE.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import extendederrors import dns -from dnsdisttests import DNSDistTest, pickAvailablePort +from dnsdisttests import DNSDistTest class TestBasics(DNSDistTest): diff --git a/regression-tests.dnsdist/test_EDNSSelfGenerated.py b/regression-tests.dnsdist/test_EDNSSelfGenerated.py index 09147e004a..e29144ebe5 100644 --- a/regression-tests.dnsdist/test_EDNSSelfGenerated.py +++ b/regression-tests.dnsdist/test_EDNSSelfGenerated.py @@ -2,7 +2,6 @@ import dns import clientsubnetoption from dnsdisttests import DNSDistTest -from datetime import datetime, timedelta class TestEDNSSelfGenerated(DNSDistTest): """ diff --git a/regression-tests.dnsdist/test_EdnsClientSubnet.py b/regression-tests.dnsdist/test_EdnsClientSubnet.py index e212e965b5..e93bbe918b 100644 --- a/regression-tests.dnsdist/test_EdnsClientSubnet.py +++ b/regression-tests.dnsdist/test_EdnsClientSubnet.py @@ -3,7 +3,6 @@ import dns import clientsubnetoption import cookiesoption from dnsdisttests import DNSDistTest -from datetime import datetime, timedelta class TestEdnsClientSubnetNoOverride(DNSDistTest): """ diff --git a/regression-tests.dnsdist/test_Lua.py b/regression-tests.dnsdist/test_Lua.py index df3c78d7b9..2131054b86 100644 --- a/regression-tests.dnsdist/test_Lua.py +++ b/regression-tests.dnsdist/test_Lua.py @@ -3,7 +3,6 @@ import base64 import dns import time -import unittest from dnsdisttests import DNSDistTest class TestLuaThread(DNSDistTest): diff --git a/regression-tests.dnsdist/test_LuaFFI.py b/regression-tests.dnsdist/test_LuaFFI.py index da12e1e605..ff14d6df5f 100644 --- a/regression-tests.dnsdist/test_LuaFFI.py +++ b/regression-tests.dnsdist/test_LuaFFI.py @@ -1,6 +1,5 @@ #!/usr/bin/env python -import unittest import dns from dnsdisttests import DNSDistTest diff --git a/regression-tests.dnsdist/test_Metrics.py b/regression-tests.dnsdist/test_Metrics.py index 1146e3d5b3..25b51f1698 100644 --- a/regression-tests.dnsdist/test_Metrics.py +++ b/regression-tests.dnsdist/test_Metrics.py @@ -1,10 +1,6 @@ #!/usr/bin/env python -import os import requests -import socket -import threading -import unittest import dns from dnsdisttests import DNSDistTest, pickAvailablePort diff --git a/regression-tests.dnsdist/test_NetworkBindings.py b/regression-tests.dnsdist/test_NetworkBindings.py index f90ccd9c27..3e161d1f6c 100644 --- a/regression-tests.dnsdist/test_NetworkBindings.py +++ b/regression-tests.dnsdist/test_NetworkBindings.py @@ -2,7 +2,6 @@ import unittest import os import subprocess -import time class TestNetworkEndpointConfig(unittest.TestCase): diff --git a/regression-tests.dnsdist/test_OCSP.py b/regression-tests.dnsdist/test_OCSP.py index 70d3d6702e..b3ab4ba5d6 100644 --- a/regression-tests.dnsdist/test_OCSP.py +++ b/regression-tests.dnsdist/test_OCSP.py @@ -1,6 +1,5 @@ #!/usr/bin/env python import base64 -import dns import os import subprocess import unittest diff --git a/regression-tests.dnsdist/test_OutgoingTLS.py b/regression-tests.dnsdist/test_OutgoingTLS.py index 71d0edb891..0f4aa200b0 100644 --- a/regression-tests.dnsdist/test_OutgoingTLS.py +++ b/regression-tests.dnsdist/test_OutgoingTLS.py @@ -3,7 +3,6 @@ import dns import requests import ssl import threading -import time import os from dnsdisttests import DNSDistTest, pickAvailablePort diff --git a/regression-tests.dnsdist/test_PoolManagement.py b/regression-tests.dnsdist/test_PoolManagement.py index 9120d78dfb..7e6c31b0fb 100644 --- a/regression-tests.dnsdist/test_PoolManagement.py +++ b/regression-tests.dnsdist/test_PoolManagement.py @@ -1,6 +1,6 @@ #!/usr/bin/env python import dns -from dnsdisttests import DNSDistTest, pickAvailablePort +from dnsdisttests import DNSDistTest class TestPoolManagement(DNSDistTest): _config_template = """ diff --git a/regression-tests.dnsdist/test_RecordsCount.py b/regression-tests.dnsdist/test_RecordsCount.py index 2ea150bb5e..a4285bb705 100644 --- a/regression-tests.dnsdist/test_RecordsCount.py +++ b/regression-tests.dnsdist/test_RecordsCount.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -import copy -import os import dns from dnsdisttests import DNSDistTest diff --git a/regression-tests.dnsdist/test_Responses.py b/regression-tests.dnsdist/test_Responses.py index d00d5d1be2..3360927f01 100644 --- a/regression-tests.dnsdist/test_Responses.py +++ b/regression-tests.dnsdist/test_Responses.py @@ -1,6 +1,5 @@ #!/usr/bin/env python from datetime import datetime, timedelta -import time import dns import cookiesoption from dnsdisttests import DNSDistTest diff --git a/regression-tests.dnsdist/test_RestartQuery.py b/regression-tests.dnsdist/test_RestartQuery.py index 274889802d..9723e95af3 100644 --- a/regression-tests.dnsdist/test_RestartQuery.py +++ b/regression-tests.dnsdist/test_RestartQuery.py @@ -1,7 +1,6 @@ #!/usr/bin/env python from queue import Queue import threading -import clientsubnetoption import dns from dnsdisttests import DNSDistTest, pickAvailablePort from proxyprotocolutils import ProxyProtocolUDPResponder, ProxyProtocolTCPResponder diff --git a/regression-tests.dnsdist/test_SNI.py b/regression-tests.dnsdist/test_SNI.py index 990d094d6d..e94a1930a1 100644 --- a/regression-tests.dnsdist/test_SNI.py +++ b/regression-tests.dnsdist/test_SNI.py @@ -1,9 +1,7 @@ #!/usr/bin/env python -import base64 import dns import os import unittest -import pycurl import ssl from dnsdisttests import DNSDistTest, pickAvailablePort diff --git a/regression-tests.dnsdist/test_SNMP.py b/regression-tests.dnsdist/test_SNMP.py index 34552a03e2..152d00cac7 100644 --- a/regression-tests.dnsdist/test_SNMP.py +++ b/regression-tests.dnsdist/test_SNMP.py @@ -1,6 +1,5 @@ #!/usr/bin/env python import dns -import time from pysnmp.hlapi import * from dnsdisttests import DNSDistTest diff --git a/regression-tests.dnsdist/test_TCPFastOpen.py b/regression-tests.dnsdist/test_TCPFastOpen.py index 3e98487c47..22f9d7090a 100644 --- a/regression-tests.dnsdist/test_TCPFastOpen.py +++ b/regression-tests.dnsdist/test_TCPFastOpen.py @@ -1,6 +1,5 @@ #!/usr/bin/env python import threading -import clientsubnetoption import dns import requests import socket diff --git a/regression-tests.dnsdist/test_TCPKeepAlive.py b/regression-tests.dnsdist/test_TCPKeepAlive.py index a3ca2f7c85..142f7c6d3c 100644 --- a/regression-tests.dnsdist/test_TCPKeepAlive.py +++ b/regression-tests.dnsdist/test_TCPKeepAlive.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -import struct import time import dns from dnsdisttests import DNSDistTest diff --git a/regression-tests.dnsdist/test_TCPShort.py b/regression-tests.dnsdist/test_TCPShort.py index 131ad6c829..f11f598448 100644 --- a/regression-tests.dnsdist/test_TCPShort.py +++ b/regression-tests.dnsdist/test_TCPShort.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -import socket import struct import threading import time diff --git a/regression-tests.dnsdist/test_TLS.py b/regression-tests.dnsdist/test_TLS.py index 56f801252d..eb0d2b304c 100644 --- a/regression-tests.dnsdist/test_TLS.py +++ b/regression-tests.dnsdist/test_TLS.py @@ -3,9 +3,7 @@ import base64 import dns import socket import ssl -import subprocess import time -import unittest import random import string diff --git a/regression-tests.dnsdist/test_Tags.py b/regression-tests.dnsdist/test_Tags.py index 9760a6fdba..f3a3ab416f 100644 --- a/regression-tests.dnsdist/test_Tags.py +++ b/regression-tests.dnsdist/test_Tags.py @@ -1,6 +1,5 @@ #!/usr/bin/env python import dns -import clientsubnetoption from dnsdisttests import DNSDistTest class TestTags(DNSDistTest): diff --git a/regression-tests.dnsdist/test_TeeAction.py b/regression-tests.dnsdist/test_TeeAction.py index 6f5f2c8ab9..56194d8601 100644 --- a/regression-tests.dnsdist/test_TeeAction.py +++ b/regression-tests.dnsdist/test_TeeAction.py @@ -4,7 +4,7 @@ import threading import clientsubnetoption import dns from dnsdisttests import DNSDistTest, Queue, pickAvailablePort -from proxyprotocolutils import ProxyProtocolUDPResponder, ProxyProtocolTCPResponder +from proxyprotocolutils import ProxyProtocolUDPResponder class TestTeeAction(DNSDistTest): diff --git a/regression-tests.ixfrdist/ixfrdisttests.py b/regression-tests.ixfrdist/ixfrdisttests.py index 851e59799c..a56642cdec 100644 --- a/regression-tests.ixfrdist/ixfrdisttests.py +++ b/regression-tests.ixfrdist/ixfrdisttests.py @@ -1,7 +1,6 @@ #!/usr/bin/env python2 import errno -import shutil import os import socket import struct diff --git a/regression-tests.ixfrdist/test_CaseSensitiveTXT.py b/regression-tests.ixfrdist/test_CaseSensitiveTXT.py index 344282210b..50a9b37288 100644 --- a/regression-tests.ixfrdist/test_CaseSensitiveTXT.py +++ b/regression-tests.ixfrdist/test_CaseSensitiveTXT.py @@ -1,8 +1,6 @@ import dns import dns.serial import time -import itertools -import socket from ixfrdisttests import IXFRDistTest from xfrserver.xfrserver import AXFRServer diff --git a/regression-tests.recursor-dnssec/test_API.py b/regression-tests.recursor-dnssec/test_API.py index 310338f2d4..89fb070066 100644 --- a/regression-tests.recursor-dnssec/test_API.py +++ b/regression-tests.recursor-dnssec/test_API.py @@ -1,4 +1,3 @@ -import os import requests from recursortests import RecursorTest diff --git a/regression-tests.recursor-dnssec/test_Additionals.py b/regression-tests.recursor-dnssec/test_Additionals.py index 845483c9f9..73baafb3d6 100644 --- a/regression-tests.recursor-dnssec/test_Additionals.py +++ b/regression-tests.recursor-dnssec/test_Additionals.py @@ -1,5 +1,4 @@ import dns -import os from recursortests import RecursorTest class AdditionalsDefaultTest(RecursorTest): diff --git a/regression-tests.recursor-dnssec/test_AggressiveNSECCache.py b/regression-tests.recursor-dnssec/test_AggressiveNSECCache.py index 5ea3ebfdce..06684e76a4 100644 --- a/regression-tests.recursor-dnssec/test_AggressiveNSECCache.py +++ b/regression-tests.recursor-dnssec/test_AggressiveNSECCache.py @@ -3,7 +3,6 @@ from recursortests import RecursorTest import os import requests import subprocess -import time import extendederrors class AggressiveNSECCacheBase(RecursorTest): diff --git a/regression-tests.recursor-dnssec/test_Carbon.py b/regression-tests.recursor-dnssec/test_Carbon.py index 37bb3d4726..0f689dd0ab 100644 --- a/regression-tests.recursor-dnssec/test_Carbon.py +++ b/regression-tests.recursor-dnssec/test_Carbon.py @@ -3,7 +3,6 @@ import threading import socket import sys import time -import os from queue import Queue from recursortests import RecursorTest diff --git a/regression-tests.recursor-dnssec/test_Chain.py b/regression-tests.recursor-dnssec/test_Chain.py index 4672df103e..d4871718ce 100644 --- a/regression-tests.recursor-dnssec/test_Chain.py +++ b/regression-tests.recursor-dnssec/test_Chain.py @@ -1,7 +1,4 @@ -import pytest import dns -import os -import time import clientsubnetoption from recursortests import RecursorTest diff --git a/regression-tests.recursor-dnssec/test_Cookies.py b/regression-tests.recursor-dnssec/test_Cookies.py index 995b0f7f34..87b427aaf4 100644 --- a/regression-tests.recursor-dnssec/test_Cookies.py +++ b/regression-tests.recursor-dnssec/test_Cookies.py @@ -1,5 +1,4 @@ import dns -import socket import os import time @@ -8,7 +7,6 @@ from twisted.internet.protocol import Protocol from twisted.internet.protocol import DatagramProtocol from twisted.internet import reactor -import clientsubnetoption import cookiesoption from recursortests import RecursorTest diff --git a/regression-tests.recursor-dnssec/test_ECS.py b/regression-tests.recursor-dnssec/test_ECS.py index 7095321d8a..f5b07b6efe 100644 --- a/regression-tests.recursor-dnssec/test_ECS.py +++ b/regression-tests.recursor-dnssec/test_ECS.py @@ -2,7 +2,6 @@ import dns import os import socket import struct -import threading import time import clientsubnetoption import unittest diff --git a/regression-tests.recursor-dnssec/test_EDNS.py b/regression-tests.recursor-dnssec/test_EDNS.py index 172ab39803..586105e427 100644 --- a/regression-tests.recursor-dnssec/test_EDNS.py +++ b/regression-tests.recursor-dnssec/test_EDNS.py @@ -1,15 +1,8 @@ import dns -import os -import socket -import struct -import threading -import time import sys from unittest import SkipTest from recursortests import RecursorTest -from twisted.internet.protocol import DatagramProtocol -from twisted.internet import reactor ednsBufferReactorRunning = False diff --git a/regression-tests.recursor-dnssec/test_EDNSBufferSize.py b/regression-tests.recursor-dnssec/test_EDNSBufferSize.py index 319c3866aa..3f9120608c 100644 --- a/regression-tests.recursor-dnssec/test_EDNSBufferSize.py +++ b/regression-tests.recursor-dnssec/test_EDNSBufferSize.py @@ -1,9 +1,5 @@ import dns import os -import socket -import struct -import threading -import time from recursortests import RecursorTest from twisted.internet.protocol import DatagramProtocol diff --git a/regression-tests.recursor-dnssec/test_Expired.py b/regression-tests.recursor-dnssec/test_Expired.py index 18434f72ec..fb372d14eb 100644 --- a/regression-tests.recursor-dnssec/test_Expired.py +++ b/regression-tests.recursor-dnssec/test_Expired.py @@ -1,7 +1,4 @@ -import errno import os -import subprocess -import time import dns import extendederrors diff --git a/regression-tests.recursor-dnssec/test_FWCatz.py b/regression-tests.recursor-dnssec/test_FWCatz.py index 7d619bca38..2132f87825 100644 --- a/regression-tests.recursor-dnssec/test_FWCatz.py +++ b/regression-tests.recursor-dnssec/test_FWCatz.py @@ -1,7 +1,4 @@ import dns -import json -import os -import requests import socket import struct import sys diff --git a/regression-tests.recursor-dnssec/test_Interop.py b/regression-tests.recursor-dnssec/test_Interop.py index aa3d5125e7..a00e746610 100644 --- a/regression-tests.recursor-dnssec/test_Interop.py +++ b/regression-tests.recursor-dnssec/test_Interop.py @@ -1,11 +1,8 @@ import dns -import socket -import copy import os from recursortests import RecursorTest from twisted.internet.protocol import DatagramProtocol from twisted.internet import reactor -import threading class InteropTest(RecursorTest): _confdir = 'Interop' diff --git a/regression-tests.recursor-dnssec/test_Lua.py b/regression-tests.recursor-dnssec/test_Lua.py index 57fbe0a465..7997e52895 100644 --- a/regression-tests.recursor-dnssec/test_Lua.py +++ b/regression-tests.recursor-dnssec/test_Lua.py @@ -2,8 +2,6 @@ import clientsubnetoption import cookiesoption import dns import os -import threading -import time from twisted.internet.protocol import DatagramProtocol from twisted.internet import reactor diff --git a/regression-tests.recursor-dnssec/test_NotYetValid.py b/regression-tests.recursor-dnssec/test_NotYetValid.py index a6b41b1a47..75d49eb0e1 100644 --- a/regression-tests.recursor-dnssec/test_NotYetValid.py +++ b/regression-tests.recursor-dnssec/test_NotYetValid.py @@ -1,7 +1,4 @@ -import errno import os -import subprocess -import time import dns from recursortests import RecursorTest diff --git a/regression-tests.recursor-dnssec/test_Notify.py b/regression-tests.recursor-dnssec/test_Notify.py index 8f33a17754..929042588e 100644 --- a/regression-tests.recursor-dnssec/test_Notify.py +++ b/regression-tests.recursor-dnssec/test_Notify.py @@ -1,9 +1,6 @@ -import clientsubnetoption -import cookiesoption import dns import os import requests -import subprocess from recursortests import RecursorTest diff --git a/regression-tests.recursor-dnssec/test_OOOTCP.py b/regression-tests.recursor-dnssec/test_OOOTCP.py index 2224a640bf..e83bda1a32 100644 --- a/regression-tests.recursor-dnssec/test_OOOTCP.py +++ b/regression-tests.recursor-dnssec/test_OOOTCP.py @@ -1,5 +1,4 @@ import dns -import os import time from recursortests import RecursorTest diff --git a/regression-tests.recursor-dnssec/test_Prometheus.py b/regression-tests.recursor-dnssec/test_Prometheus.py index 20f502e8e4..a5ddfdbc72 100644 --- a/regression-tests.recursor-dnssec/test_Prometheus.py +++ b/regression-tests.recursor-dnssec/test_Prometheus.py @@ -1,7 +1,5 @@ -import os import requests import subprocess -import unittest from recursortests import RecursorTest diff --git a/regression-tests.recursor-dnssec/test_ProxyProtocol.py b/regression-tests.recursor-dnssec/test_ProxyProtocol.py index 25801622e7..2b422c3b23 100644 --- a/regression-tests.recursor-dnssec/test_ProxyProtocol.py +++ b/regression-tests.recursor-dnssec/test_ProxyProtocol.py @@ -2,7 +2,6 @@ import dns import os import socket import struct -import sys import time import requests import subprocess diff --git a/regression-tests.recursor-dnssec/test_RDFlag.py b/regression-tests.recursor-dnssec/test_RDFlag.py index 72329f3e62..d6d27dd8bd 100644 --- a/regression-tests.recursor-dnssec/test_RDFlag.py +++ b/regression-tests.recursor-dnssec/test_RDFlag.py @@ -1,5 +1,4 @@ import dns -import os from recursortests import RecursorTest class RDNotAllowedTest(RecursorTest): diff --git a/regression-tests.recursor-dnssec/test_RPZ.py b/regression-tests.recursor-dnssec/test_RPZ.py index bf8d7bb53d..cb8b7c0402 100644 --- a/regression-tests.recursor-dnssec/test_RPZ.py +++ b/regression-tests.recursor-dnssec/test_RPZ.py @@ -1,6 +1,5 @@ import dns import dns.zone -import json import os import requests import socket diff --git a/regression-tests.recursor-dnssec/test_RPZIncomplete.py b/regression-tests.recursor-dnssec/test_RPZIncomplete.py index fa178300f7..51e10446a7 100644 --- a/regression-tests.recursor-dnssec/test_RPZIncomplete.py +++ b/regression-tests.recursor-dnssec/test_RPZIncomplete.py @@ -1,5 +1,4 @@ import dns -import json import os import requests import socket diff --git a/regression-tests.recursor-dnssec/test_RootNXTrust.py b/regression-tests.recursor-dnssec/test_RootNXTrust.py index 394cc411f2..62d60c5824 100644 --- a/regression-tests.recursor-dnssec/test_RootNXTrust.py +++ b/regression-tests.recursor-dnssec/test_RootNXTrust.py @@ -1,6 +1,5 @@ import dns import requests -import socket import time import extendederrors diff --git a/regression-tests.recursor-dnssec/test_RoutingTag.py b/regression-tests.recursor-dnssec/test_RoutingTag.py index 24ddd5fa6d..61fe9f511d 100644 --- a/regression-tests.recursor-dnssec/test_RoutingTag.py +++ b/regression-tests.recursor-dnssec/test_RoutingTag.py @@ -2,7 +2,6 @@ import dns import os import socket import struct -import threading import time import clientsubnetoption import subprocess diff --git a/regression-tests.recursor-dnssec/test_ServerNames.py b/regression-tests.recursor-dnssec/test_ServerNames.py index 1edda5c951..53d42d5590 100644 --- a/regression-tests.recursor-dnssec/test_ServerNames.py +++ b/regression-tests.recursor-dnssec/test_ServerNames.py @@ -1,5 +1,4 @@ import dns -import os from recursortests import RecursorTest class ServerNamesTest(RecursorTest): diff --git a/regression-tests.recursor-dnssec/test_TraceFail.py b/regression-tests.recursor-dnssec/test_TraceFail.py index 9b433b6fce..db70664645 100644 --- a/regression-tests.recursor-dnssec/test_TraceFail.py +++ b/regression-tests.recursor-dnssec/test_TraceFail.py @@ -1,5 +1,4 @@ import dns -import os import time import subprocess from recursortests import RecursorTest diff --git a/regression-tests.recursor-dnssec/test_ZTC.py b/regression-tests.recursor-dnssec/test_ZTC.py index 011e8d3f6c..814d547663 100644 --- a/regression-tests.recursor-dnssec/test_ZTC.py +++ b/regression-tests.recursor-dnssec/test_ZTC.py @@ -1,6 +1,4 @@ -import dns import time -import os import subprocess from recursortests import RecursorTest diff --git a/regression-tests.recursor-dnssec/test_basicNSEC.py b/regression-tests.recursor-dnssec/test_basicNSEC.py index 953aceed3b..cd432aa277 100644 --- a/regression-tests.recursor-dnssec/test_basicNSEC.py +++ b/regression-tests.recursor-dnssec/test_basicNSEC.py @@ -1,5 +1,4 @@ from basicDNSSEC import BasicDNSSEC -import unittest class basicNSECTest(BasicDNSSEC): __test__ = True diff --git a/regression-tests/tkey.py b/regression-tests/tkey.py index 1a466284e9..d25e19c6fc 100755 --- a/regression-tests/tkey.py +++ b/regression-tests/tkey.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 import socket -import select import sys def ensure(data, offset, value):