From 0f145dc1b879b7378749ba2d42802cc146388aec Mon Sep 17 00:00:00 2001 From: Bob Halley Date: Sun, 25 Jun 2023 14:18:10 -0700 Subject: [PATCH] use isort --- dns/_asyncio_backend.py | 10 ++++------ dns/_ddr.py | 3 +-- dns/_immutable_ctx.py | 1 - dns/_trio_backend.py | 6 +++--- dns/asyncbackend.py | 9 ++++----- dns/asyncquery.py | 18 ++++++++---------- dns/asyncresolver.py | 8 +++----- dns/dnssec.py | 18 ++++++++---------- dns/dnssecalgs/__init__.py | 1 - dns/edns.py | 3 +-- dns/entropy.py | 5 ++--- dns/enum.py | 3 +-- dns/flags.py | 3 +-- dns/immutable.py | 3 +-- dns/inet.py | 4 +--- dns/ipv4.py | 3 +-- dns/ipv6.py | 5 ++--- dns/message.py | 15 +++++++-------- dns/name.py | 9 +++------ dns/nameserver.py | 3 +-- dns/node.py | 6 ++---- dns/query.py | 5 ++--- dns/quic/__init__.py | 7 ++++--- dns/quic/_asyncio.py | 8 ++++---- dns/quic/_common.py | 3 +-- dns/quic/_sync.py | 8 ++++---- dns/quic/_trio.py | 4 ++-- dns/rdata.py | 9 ++++----- dns/rdataset.py | 7 +++---- dns/rdtypes/ANY/AFSDB.py | 2 +- dns/rdtypes/ANY/AVC.py | 2 +- dns/rdtypes/ANY/CDNSKEY.py | 8 ++++---- dns/rdtypes/ANY/CDS.py | 2 +- dns/rdtypes/ANY/CERT.py | 4 ++-- dns/rdtypes/ANY/CNAME.py | 2 +- dns/rdtypes/ANY/CSYNC.py | 2 +- dns/rdtypes/ANY/DLV.py | 2 +- dns/rdtypes/ANY/DNAME.py | 2 +- dns/rdtypes/ANY/DNSKEY.py | 8 ++++---- dns/rdtypes/ANY/DS.py | 2 +- dns/rdtypes/ANY/EUI48.py | 2 +- dns/rdtypes/ANY/EUI64.py | 2 +- dns/rdtypes/ANY/HIP.py | 2 +- dns/rdtypes/ANY/LOC.py | 1 - dns/rdtypes/ANY/MX.py | 2 +- dns/rdtypes/ANY/NINFO.py | 2 +- dns/rdtypes/ANY/NS.py | 2 +- dns/rdtypes/ANY/NSEC.py | 2 +- dns/rdtypes/ANY/NSEC3.py | 1 - dns/rdtypes/ANY/NSEC3PARAM.py | 2 +- dns/rdtypes/ANY/OPT.py | 3 +-- dns/rdtypes/ANY/PTR.py | 2 +- dns/rdtypes/ANY/RP.py | 2 +- dns/rdtypes/ANY/RRSIG.py | 2 +- dns/rdtypes/ANY/RT.py | 2 +- dns/rdtypes/ANY/SOA.py | 2 +- dns/rdtypes/ANY/SPF.py | 2 +- dns/rdtypes/ANY/SSHFP.py | 4 ++-- dns/rdtypes/ANY/TKEY.py | 2 +- dns/rdtypes/ANY/TXT.py | 2 +- dns/rdtypes/ANY/URI.py | 2 +- dns/rdtypes/ANY/ZONEMD.py | 2 +- dns/rdtypes/CH/A.py | 2 +- dns/rdtypes/IN/HTTPS.py | 2 +- dns/rdtypes/IN/IPSECKEY.py | 2 +- dns/rdtypes/IN/KX.py | 2 +- dns/rdtypes/IN/NSAP_PTR.py | 2 +- dns/rdtypes/IN/PX.py | 2 +- dns/rdtypes/IN/SRV.py | 2 +- dns/rdtypes/IN/SVCB.py | 2 +- dns/rdtypes/IN/WKS.py | 2 +- dns/rdtypes/dnskeybase.py | 2 +- dns/rdtypes/dsbase.py | 2 +- dns/rdtypes/euibase.py | 2 +- dns/rdtypes/mxbase.py | 2 +- dns/rdtypes/nsbase.py | 2 +- dns/rdtypes/tlsabase.py | 4 ++-- dns/rdtypes/txtbase.py | 3 +-- dns/renderer.py | 3 +-- dns/resolver.py | 7 +++---- dns/reversename.py | 4 ++-- dns/rrset.py | 4 ++-- dns/tokenizer.py | 3 +-- dns/transaction.py | 3 +-- dns/tsig.py | 2 +- dns/tsigkeyring.py | 3 +-- dns/update.py | 2 +- dns/versioned.py | 3 +-- dns/win32util.py | 1 + dns/wire.py | 3 +-- dns/xfr.py | 2 +- dns/zone.py | 11 +++++------ dns/zonefile.py | 7 +++---- pyproject.toml | 3 +++ 94 files changed, 162 insertions(+), 202 deletions(-) diff --git a/dns/_asyncio_backend.py b/dns/_asyncio_backend.py index 0f163703..e55b73a9 100644 --- a/dns/_asyncio_backend.py +++ b/dns/_asyncio_backend.py @@ -2,14 +2,13 @@ """asyncio library query support""" -import socket import asyncio +import socket import sys import dns._asyncbackend import dns.exception - _is_win32 = sys.platform == "win32" @@ -121,13 +120,12 @@ class StreamSocket(dns._asyncbackend.StreamSocket): try: import anyio - import httpx - import httpcore - import httpcore.backends.base import httpcore.backends.asyncio + import httpcore.backends.base + import httpx - from dns.query import _compute_times, _remaining, _expiration_for_this_attempt + from dns.query import _compute_times, _expiration_for_this_attempt, _remaining class _NetworkBackend(httpcore.backends.base.AsyncNetworkBackend): def __init__(self, resolver, local_port, bootstrap_address, family): diff --git a/dns/_ddr.py b/dns/_ddr.py index c212489d..bf5c11eb 100644 --- a/dns/_ddr.py +++ b/dns/_ddr.py @@ -2,9 +2,9 @@ # # Support for Discovery of Designated Resolvers -from urllib.parse import urlparse import socket import time +from urllib.parse import urlparse import dns.asyncbackend import dns.inet @@ -13,7 +13,6 @@ import dns.nameserver import dns.query import dns.rdtypes.svcbbase - # The special name of the local resolver when using DDR _local_resolver_name = dns.name.from_text("_dns.resolver.arpa") diff --git a/dns/_immutable_ctx.py b/dns/_immutable_ctx.py index 63c0a2d3..ae7a33bf 100644 --- a/dns/_immutable_ctx.py +++ b/dns/_immutable_ctx.py @@ -7,7 +7,6 @@ import contextvars import inspect - _in__init__ = contextvars.ContextVar("_immutable_in__init__", default=False) diff --git a/dns/_trio_backend.py b/dns/_trio_backend.py index ff5da9eb..81544832 100644 --- a/dns/_trio_backend.py +++ b/dns/_trio_backend.py @@ -3,6 +3,7 @@ """trio async I/O library query support""" import socket + import trio import trio.socket # type: ignore @@ -95,13 +96,12 @@ class StreamSocket(dns._asyncbackend.StreamSocket): try: - import httpx - import httpcore import httpcore.backends.base import httpcore.backends.trio + import httpx - from dns.query import _compute_times, _remaining, _expiration_for_this_attempt + from dns.query import _compute_times, _expiration_for_this_attempt, _remaining class _NetworkBackend(httpcore.backends.base.AsyncNetworkBackend): def __init__(self, resolver, local_port, bootstrap_address, family): diff --git a/dns/asyncbackend.py b/dns/asyncbackend.py index b6d3211d..07d50e1e 100644 --- a/dns/asyncbackend.py +++ b/dns/asyncbackend.py @@ -5,13 +5,12 @@ from typing import Dict import dns.exception # pylint: disable=unused-import - -from dns._asyncbackend import ( - Socket, +from dns._asyncbackend import ( # noqa: F401 lgtm[py/unused-import] + Backend, DatagramSocket, + Socket, StreamSocket, - Backend, -) # noqa: F401 lgtm[py/unused-import] +) # pylint: enable=unused-import diff --git a/dns/asyncquery.py b/dns/asyncquery.py index 97afa0b3..54093c17 100644 --- a/dns/asyncquery.py +++ b/dns/asyncquery.py @@ -17,36 +17,34 @@ """Talk to a DNS server.""" -from typing import Any, Dict, Optional, Tuple, Union - import base64 import contextlib import socket import struct import time +from typing import Any, Dict, Optional, Tuple, Union import dns.asyncbackend import dns.exception import dns.inet -import dns.name import dns.message +import dns.name import dns.quic import dns.rcode import dns.rdataclass import dns.rdatatype import dns.transaction - from dns._asyncbackend import NullContext from dns.query import ( - _compute_times, - _matches_destination, BadResponse, - ssl, - UDPMode, - have_doh, - _have_http2, NoDOH, NoDOQ, + UDPMode, + _compute_times, + _have_http2, + _matches_destination, + have_doh, + ssl, ) if have_doh: diff --git a/dns/asyncresolver.py b/dns/asyncresolver.py index 1c84365a..8f5e062a 100644 --- a/dns/asyncresolver.py +++ b/dns/asyncresolver.py @@ -17,14 +17,13 @@ """Asynchronous DNS stub resolver.""" -from typing import Any, Dict, List, Optional, Union - import socket import time +from typing import Any, Dict, List, Optional, Union +import dns._ddr import dns.asyncbackend import dns.asyncquery -import dns._ddr import dns.exception import dns.name import dns.query @@ -33,8 +32,7 @@ import dns.rdatatype import dns.resolver # lgtm[py/import-and-import-from] # import some resolver symbols for brevity -from dns.resolver import NXDOMAIN, NoAnswer, NotAbsolute, NoRootSOA - +from dns.resolver import NXDOMAIN, NoAnswer, NoRootSOA, NotAbsolute # for indentation purposes below _udp = dns.asyncquery.udp diff --git a/dns/dnssec.py b/dns/dnssec.py index d9b8d98d..24a4b87d 100644 --- a/dns/dnssec.py +++ b/dns/dnssec.py @@ -18,28 +18,26 @@ """Common DNSSEC-related functions and constants.""" -from typing import cast, Callable, Dict, List, Optional, Set, Tuple, Union - +import base64 import contextlib import functools import hashlib import struct import time -import base64 from datetime import datetime - -from dns.dnssectypes import Algorithm, DSDigest, NSEC3Hash +from typing import Callable, Dict, List, Optional, Set, Tuple, Union, cast import dns.exception import dns.name import dns.node -import dns.rdataset import dns.rdata -import dns.rdatatype import dns.rdataclass +import dns.rdataset +import dns.rdatatype import dns.rrset import dns.transaction import dns.zone +from dns.dnssectypes import Algorithm, DSDigest, NSEC3Hash from dns.exception import ( # pylint: disable=W0611 AlgorithmKeyMismatch, DeniedByPolicy, @@ -55,7 +53,6 @@ from dns.rdtypes.ANY.NSEC3PARAM import NSEC3PARAM from dns.rdtypes.ANY.RRSIG import RRSIG, sigtime_to_posixtime from dns.rdtypes.dnskeybase import Flag - PublicKey = Union[ "GenericPublicKey", "rsa.RSAPublicKey", @@ -1173,11 +1170,12 @@ try: from cryptography.exceptions import InvalidSignature from cryptography.hazmat.primitives.asymmetric import dsa # pylint: disable=W0611 from cryptography.hazmat.primitives.asymmetric import ec # pylint: disable=W0611 + from cryptography.hazmat.primitives.asymmetric import ed448 # pylint: disable=W0611 + from cryptography.hazmat.primitives.asymmetric import rsa # pylint: disable=W0611 from cryptography.hazmat.primitives.asymmetric import ( # pylint: disable=W0611 ed25519, ) - from cryptography.hazmat.primitives.asymmetric import ed448 # pylint: disable=W0611 - from cryptography.hazmat.primitives.asymmetric import rsa # pylint: disable=W0611 + from dns.dnssecalgs import ( # pylint: disable=C0412 get_algorithm_cls, get_algorithm_cls_from_dnskey, diff --git a/dns/dnssecalgs/__init__.py b/dns/dnssecalgs/__init__.py index d4c89cd6..0c48c89e 100644 --- a/dns/dnssecalgs/__init__.py +++ b/dns/dnssecalgs/__init__.py @@ -16,7 +16,6 @@ from dns.dnssectypes import Algorithm from dns.exception import UnsupportedAlgorithm from dns.rdtypes.ANY.DNSKEY import DNSKEY - AlgorithmPrefix = Optional[Union[bytes, dns.name.Name]] algorithms: Dict[Tuple[Algorithm, AlgorithmPrefix], Type[GenericPrivateKey]] = { diff --git a/dns/edns.py b/dns/edns.py index 40899ee8..f05baac4 100644 --- a/dns/edns.py +++ b/dns/edns.py @@ -17,11 +17,10 @@ """EDNS Options""" -from typing import Any, Dict, Optional, Union - import math import socket import struct +from typing import Any, Dict, Optional, Union import dns.enum import dns.inet diff --git a/dns/entropy.py b/dns/entropy.py index 36168181..4dcdc627 100644 --- a/dns/entropy.py +++ b/dns/entropy.py @@ -15,13 +15,12 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -from typing import Any, Optional - -import os import hashlib +import os import random import threading import time +from typing import Any, Optional class EntropyPool: diff --git a/dns/enum.py b/dns/enum.py index 21cab15a..71461f17 100644 --- a/dns/enum.py +++ b/dns/enum.py @@ -15,9 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -from typing import Type, TypeVar, Union - import enum +from typing import Type, TypeVar, Union TIntEnum = TypeVar("TIntEnum", bound="IntEnum") diff --git a/dns/flags.py b/dns/flags.py index b21b8e3b..4c60be13 100644 --- a/dns/flags.py +++ b/dns/flags.py @@ -17,9 +17,8 @@ """DNS Message Flags.""" -from typing import Any - import enum +from typing import Any # Standard DNS flags diff --git a/dns/immutable.py b/dns/immutable.py index 38fbe597..cab8d6fb 100644 --- a/dns/immutable.py +++ b/dns/immutable.py @@ -1,8 +1,7 @@ # Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license -from typing import Any - import collections.abc +from typing import Any from dns._immutable_ctx import immutable diff --git a/dns/inet.py b/dns/inet.py index 23a4a86e..02e925c6 100644 --- a/dns/inet.py +++ b/dns/inet.py @@ -17,14 +17,12 @@ """Generic Internet address helper functions.""" -from typing import Any, Optional, Tuple - import socket +from typing import Any, Optional, Tuple import dns.ipv4 import dns.ipv6 - # We assume that AF_INET and AF_INET6 are always defined. We keep # these here for the benefit of any old code (unlikely though that # is!). diff --git a/dns/ipv4.py b/dns/ipv4.py index b8e148f3..f549150a 100644 --- a/dns/ipv4.py +++ b/dns/ipv4.py @@ -17,9 +17,8 @@ """IPv4 helper functions.""" -from typing import Union - import struct +from typing import Union import dns.exception diff --git a/dns/ipv6.py b/dns/ipv6.py index fbd49623..0cc3d868 100644 --- a/dns/ipv6.py +++ b/dns/ipv6.py @@ -17,10 +17,9 @@ """IPv6 helper functions.""" -from typing import List, Union - -import re import binascii +import re +from typing import List, Union import dns.exception import dns.ipv4 diff --git a/dns/message.py b/dns/message.py index 13600e41..daae6363 100644 --- a/dns/message.py +++ b/dns/message.py @@ -17,30 +17,29 @@ """DNS Messages""" -from typing import Any, Dict, List, Optional, Tuple, Union - import contextlib import io import time +from typing import Any, Dict, List, Optional, Tuple, Union -import dns.wire import dns.edns +import dns.entropy import dns.enum import dns.exception import dns.flags import dns.name import dns.opcode -import dns.entropy import dns.rcode import dns.rdata import dns.rdataclass import dns.rdatatype -import dns.rrset -import dns.renderer -import dns.ttl -import dns.tsig import dns.rdtypes.ANY.OPT import dns.rdtypes.ANY.TSIG +import dns.renderer +import dns.rrset +import dns.tsig +import dns.ttl +import dns.wire class ShortHeader(dns.exception.FormError): diff --git a/dns/name.py b/dns/name.py index 612af021..f452bfed 100644 --- a/dns/name.py +++ b/dns/name.py @@ -18,12 +18,10 @@ """DNS Names. """ -from typing import Any, Dict, Iterable, Optional, Tuple, Union - import copy -import struct - import encodings.idna # type: ignore +import struct +from typing import Any, Dict, Iterable, Optional, Tuple, Union try: import idna # type: ignore @@ -33,10 +31,9 @@ except ImportError: # pragma: no cover have_idna_2008 = False import dns.enum -import dns.wire import dns.exception import dns.immutable - +import dns.wire CompressType = Dict["Name", int] diff --git a/dns/nameserver.py b/dns/nameserver.py index b0824657..5910139e 100644 --- a/dns/nameserver.py +++ b/dns/nameserver.py @@ -1,6 +1,5 @@ -from urllib.parse import urlparse - from typing import Optional, Union +from urllib.parse import urlparse import dns.asyncbackend import dns.asyncquery diff --git a/dns/node.py b/dns/node.py index 22bbe7cb..c670243c 100644 --- a/dns/node.py +++ b/dns/node.py @@ -17,19 +17,17 @@ """DNS nodes. A node is a set of rdatasets.""" -from typing import Any, Dict, Optional - import enum import io +from typing import Any, Dict, Optional import dns.immutable import dns.name import dns.rdataclass import dns.rdataset import dns.rdatatype -import dns.rrset import dns.renderer - +import dns.rrset _cname_types = { dns.rdatatype.CNAME, diff --git a/dns/query.py b/dns/query.py index c6b05610..55476c17 100644 --- a/dns/query.py +++ b/dns/query.py @@ -17,8 +17,6 @@ """Talk to a DNS server.""" -from typing import Any, Dict, Optional, Tuple, Union - import base64 import contextlib import enum @@ -28,11 +26,12 @@ import selectors import socket import struct import time +from typing import Any, Dict, Optional, Tuple, Union import dns.exception import dns.inet -import dns.name import dns.message +import dns.name import dns.quic import dns.rcode import dns.rdataclass diff --git a/dns/quic/__init__.py b/dns/quic/__init__.py index f48ecf57..69813f9f 100644 --- a/dns/quic/__init__.py +++ b/dns/quic/__init__.py @@ -5,13 +5,13 @@ try: import dns.asyncbackend from dns._asyncbackend import NullContext - from dns.quic._sync import SyncQuicManager, SyncQuicConnection, SyncQuicStream from dns.quic._asyncio import ( - AsyncioQuicManager, AsyncioQuicConnection, + AsyncioQuicManager, AsyncioQuicStream, ) from dns.quic._common import AsyncQuicConnection, AsyncQuicManager + from dns.quic._sync import SyncQuicConnection, SyncQuicManager, SyncQuicStream have_quic = True @@ -33,9 +33,10 @@ try: try: import trio + from dns.quic._trio import ( # pylint: disable=ungrouped-imports - TrioQuicManager, TrioQuicConnection, + TrioQuicManager, TrioQuicStream, ) diff --git a/dns/quic/_asyncio.py b/dns/quic/_asyncio.py index 69d884c1..b6be228f 100644 --- a/dns/quic/_asyncio.py +++ b/dns/quic/_asyncio.py @@ -9,14 +9,14 @@ import time import aioquic.quic.configuration # type: ignore import aioquic.quic.connection # type: ignore import aioquic.quic.events # type: ignore -import dns.inet -import dns.asyncbackend +import dns.asyncbackend +import dns.inet from dns.quic._common import ( - BaseQuicStream, + QUIC_MAX_DATAGRAM, AsyncQuicConnection, AsyncQuicManager, - QUIC_MAX_DATAGRAM, + BaseQuicStream, UnexpectedEOF, ) diff --git a/dns/quic/_common.py b/dns/quic/_common.py index 442b3820..b9717be3 100644 --- a/dns/quic/_common.py +++ b/dns/quic/_common.py @@ -3,13 +3,12 @@ import socket import struct import time - from typing import Any import aioquic.quic.configuration # type: ignore import aioquic.quic.connection # type: ignore -import dns.inet +import dns.inet QUIC_MAX_DATAGRAM = 2048 diff --git a/dns/quic/_sync.py b/dns/quic/_sync.py index bc9f172c..5d7df571 100644 --- a/dns/quic/_sync.py +++ b/dns/quic/_sync.py @@ -1,8 +1,8 @@ # Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license +import selectors import socket import ssl -import selectors import struct import threading import time @@ -10,13 +10,13 @@ import time import aioquic.quic.configuration # type: ignore import aioquic.quic.connection # type: ignore import aioquic.quic.events # type: ignore -import dns.inet +import dns.inet from dns.quic._common import ( - BaseQuicStream, + QUIC_MAX_DATAGRAM, BaseQuicConnection, BaseQuicManager, - QUIC_MAX_DATAGRAM, + BaseQuicStream, UnexpectedEOF, ) diff --git a/dns/quic/_trio.py b/dns/quic/_trio.py index 38eab3e9..db73a902 100644 --- a/dns/quic/_trio.py +++ b/dns/quic/_trio.py @@ -13,10 +13,10 @@ import trio import dns.inet from dns._asyncbackend import NullContext from dns.quic._common import ( - BaseQuicStream, + QUIC_MAX_DATAGRAM, AsyncQuicConnection, AsyncQuicManager, - QUIC_MAX_DATAGRAM, + BaseQuicStream, UnexpectedEOF, ) diff --git a/dns/rdata.py b/dns/rdata.py index f0b340c7..0d262e8d 100644 --- a/dns/rdata.py +++ b/dns/rdata.py @@ -17,17 +17,15 @@ """DNS rdata.""" -from typing import Any, Dict, Optional, Tuple, Union - -from importlib import import_module import base64 import binascii -import io import inspect +import io import itertools import random +from importlib import import_module +from typing import Any, Dict, Optional, Tuple, Union -import dns.wire import dns.exception import dns.immutable import dns.ipv4 @@ -37,6 +35,7 @@ import dns.rdataclass import dns.rdatatype import dns.tokenizer import dns.ttl +import dns.wire _chunksize = 32 diff --git a/dns/rdataset.py b/dns/rdataset.py index b562d1f8..31124afc 100644 --- a/dns/rdataset.py +++ b/dns/rdataset.py @@ -17,18 +17,17 @@ """DNS rdatasets (an rdataset is a set of rdatas of a given type and class)""" -from typing import Any, cast, Collection, Dict, List, Optional, Union - import io import random import struct +from typing import Any, Collection, Dict, List, Optional, Union, cast import dns.exception import dns.immutable import dns.name -import dns.rdatatype -import dns.rdataclass import dns.rdata +import dns.rdataclass +import dns.rdatatype import dns.set import dns.ttl diff --git a/dns/rdtypes/ANY/AFSDB.py b/dns/rdtypes/ANY/AFSDB.py index d7838e7e..3d287f6e 100644 --- a/dns/rdtypes/ANY/AFSDB.py +++ b/dns/rdtypes/ANY/AFSDB.py @@ -15,8 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.mxbase import dns.immutable +import dns.rdtypes.mxbase @dns.immutable.immutable diff --git a/dns/rdtypes/ANY/AVC.py b/dns/rdtypes/ANY/AVC.py index 11e026d0..766d5e2d 100644 --- a/dns/rdtypes/ANY/AVC.py +++ b/dns/rdtypes/ANY/AVC.py @@ -15,8 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.txtbase import dns.immutable +import dns.rdtypes.txtbase @dns.immutable.immutable diff --git a/dns/rdtypes/ANY/CDNSKEY.py b/dns/rdtypes/ANY/CDNSKEY.py index 869523fb..38b8a8da 100644 --- a/dns/rdtypes/ANY/CDNSKEY.py +++ b/dns/rdtypes/ANY/CDNSKEY.py @@ -15,15 +15,15 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.dnskeybase # lgtm[py/import-and-import-from] import dns.immutable +import dns.rdtypes.dnskeybase # lgtm[py/import-and-import-from] # pylint: disable=unused-import -from dns.rdtypes.dnskeybase import ( - SEP, +from dns.rdtypes.dnskeybase import ( # noqa: F401 lgtm[py/unused-import] REVOKE, + SEP, ZONE, -) # noqa: F401 lgtm[py/unused-import] +) # pylint: enable=unused-import diff --git a/dns/rdtypes/ANY/CDS.py b/dns/rdtypes/ANY/CDS.py index 094de12b..2ff42d9a 100644 --- a/dns/rdtypes/ANY/CDS.py +++ b/dns/rdtypes/ANY/CDS.py @@ -15,8 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.dsbase import dns.immutable +import dns.rdtypes.dsbase @dns.immutable.immutable diff --git a/dns/rdtypes/ANY/CERT.py b/dns/rdtypes/ANY/CERT.py index 1b0cbeca..30fe863f 100644 --- a/dns/rdtypes/ANY/CERT.py +++ b/dns/rdtypes/ANY/CERT.py @@ -15,12 +15,12 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import struct import base64 +import struct +import dns.dnssectypes import dns.exception import dns.immutable -import dns.dnssectypes import dns.rdata import dns.tokenizer diff --git a/dns/rdtypes/ANY/CNAME.py b/dns/rdtypes/ANY/CNAME.py index a4fcfa88..759adb90 100644 --- a/dns/rdtypes/ANY/CNAME.py +++ b/dns/rdtypes/ANY/CNAME.py @@ -15,8 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.nsbase import dns.immutable +import dns.rdtypes.nsbase @dns.immutable.immutable diff --git a/dns/rdtypes/ANY/CSYNC.py b/dns/rdtypes/ANY/CSYNC.py index f819c08c..315da9ff 100644 --- a/dns/rdtypes/ANY/CSYNC.py +++ b/dns/rdtypes/ANY/CSYNC.py @@ -19,9 +19,9 @@ import struct import dns.exception import dns.immutable +import dns.name import dns.rdata import dns.rdatatype -import dns.name import dns.rdtypes.util diff --git a/dns/rdtypes/ANY/DLV.py b/dns/rdtypes/ANY/DLV.py index 947dc42e..632e90f8 100644 --- a/dns/rdtypes/ANY/DLV.py +++ b/dns/rdtypes/ANY/DLV.py @@ -15,8 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.dsbase import dns.immutable +import dns.rdtypes.dsbase @dns.immutable.immutable diff --git a/dns/rdtypes/ANY/DNAME.py b/dns/rdtypes/ANY/DNAME.py index f4984b55..556bff59 100644 --- a/dns/rdtypes/ANY/DNAME.py +++ b/dns/rdtypes/ANY/DNAME.py @@ -15,8 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.nsbase import dns.immutable +import dns.rdtypes.nsbase @dns.immutable.immutable diff --git a/dns/rdtypes/ANY/DNSKEY.py b/dns/rdtypes/ANY/DNSKEY.py index 50fa05b7..f1a63062 100644 --- a/dns/rdtypes/ANY/DNSKEY.py +++ b/dns/rdtypes/ANY/DNSKEY.py @@ -15,15 +15,15 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.dnskeybase # lgtm[py/import-and-import-from] import dns.immutable +import dns.rdtypes.dnskeybase # lgtm[py/import-and-import-from] # pylint: disable=unused-import -from dns.rdtypes.dnskeybase import ( - SEP, +from dns.rdtypes.dnskeybase import ( # noqa: F401 lgtm[py/unused-import] REVOKE, + SEP, ZONE, -) # noqa: F401 lgtm[py/unused-import] +) # pylint: enable=unused-import diff --git a/dns/rdtypes/ANY/DS.py b/dns/rdtypes/ANY/DS.py index 3f6c3ee8..097ecfa0 100644 --- a/dns/rdtypes/ANY/DS.py +++ b/dns/rdtypes/ANY/DS.py @@ -15,8 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.dsbase import dns.immutable +import dns.rdtypes.dsbase @dns.immutable.immutable diff --git a/dns/rdtypes/ANY/EUI48.py b/dns/rdtypes/ANY/EUI48.py index 0ab88ad0..7e4e1ff3 100644 --- a/dns/rdtypes/ANY/EUI48.py +++ b/dns/rdtypes/ANY/EUI48.py @@ -16,8 +16,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.euibase import dns.immutable +import dns.rdtypes.euibase @dns.immutable.immutable diff --git a/dns/rdtypes/ANY/EUI64.py b/dns/rdtypes/ANY/EUI64.py index c42957ef..68b5820f 100644 --- a/dns/rdtypes/ANY/EUI64.py +++ b/dns/rdtypes/ANY/EUI64.py @@ -16,8 +16,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.euibase import dns.immutable +import dns.rdtypes.euibase @dns.immutable.immutable diff --git a/dns/rdtypes/ANY/HIP.py b/dns/rdtypes/ANY/HIP.py index 01fec822..a20aa1e5 100644 --- a/dns/rdtypes/ANY/HIP.py +++ b/dns/rdtypes/ANY/HIP.py @@ -15,9 +15,9 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import struct import base64 import binascii +import struct import dns.exception import dns.immutable diff --git a/dns/rdtypes/ANY/LOC.py b/dns/rdtypes/ANY/LOC.py index 028375de..783d54af 100644 --- a/dns/rdtypes/ANY/LOC.py +++ b/dns/rdtypes/ANY/LOC.py @@ -21,7 +21,6 @@ import dns.exception import dns.immutable import dns.rdata - _pows = tuple(10**i for i in range(0, 11)) # default values are in centimeters diff --git a/dns/rdtypes/ANY/MX.py b/dns/rdtypes/ANY/MX.py index a697ea45..1f9df21f 100644 --- a/dns/rdtypes/ANY/MX.py +++ b/dns/rdtypes/ANY/MX.py @@ -15,8 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.mxbase import dns.immutable +import dns.rdtypes.mxbase @dns.immutable.immutable diff --git a/dns/rdtypes/ANY/NINFO.py b/dns/rdtypes/ANY/NINFO.py index d53e9676..55bc5614 100644 --- a/dns/rdtypes/ANY/NINFO.py +++ b/dns/rdtypes/ANY/NINFO.py @@ -15,8 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.txtbase import dns.immutable +import dns.rdtypes.txtbase @dns.immutable.immutable diff --git a/dns/rdtypes/ANY/NS.py b/dns/rdtypes/ANY/NS.py index a0cc232a..fe453f0d 100644 --- a/dns/rdtypes/ANY/NS.py +++ b/dns/rdtypes/ANY/NS.py @@ -15,8 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.nsbase import dns.immutable +import dns.rdtypes.nsbase @dns.immutable.immutable diff --git a/dns/rdtypes/ANY/NSEC.py b/dns/rdtypes/ANY/NSEC.py index 7af7b77f..a2d98fa7 100644 --- a/dns/rdtypes/ANY/NSEC.py +++ b/dns/rdtypes/ANY/NSEC.py @@ -17,9 +17,9 @@ import dns.exception import dns.immutable +import dns.name import dns.rdata import dns.rdatatype -import dns.name import dns.rdtypes.util diff --git a/dns/rdtypes/ANY/NSEC3.py b/dns/rdtypes/ANY/NSEC3.py index fe4e71cb..d32fe169 100644 --- a/dns/rdtypes/ANY/NSEC3.py +++ b/dns/rdtypes/ANY/NSEC3.py @@ -25,7 +25,6 @@ import dns.rdata import dns.rdatatype import dns.rdtypes.util - b32_hex_to_normal = bytes.maketrans( b"0123456789ABCDEFGHIJKLMNOPQRSTUV", b"ABCDEFGHIJKLMNOPQRSTUVWXYZ234567" ) diff --git a/dns/rdtypes/ANY/NSEC3PARAM.py b/dns/rdtypes/ANY/NSEC3PARAM.py index 1b7269a0..1a0c0e08 100644 --- a/dns/rdtypes/ANY/NSEC3PARAM.py +++ b/dns/rdtypes/ANY/NSEC3PARAM.py @@ -15,8 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import struct import binascii +import struct import dns.exception import dns.immutable diff --git a/dns/rdtypes/ANY/OPT.py b/dns/rdtypes/ANY/OPT.py index 36d4c7c6..d70e5373 100644 --- a/dns/rdtypes/ANY/OPT.py +++ b/dns/rdtypes/ANY/OPT.py @@ -18,11 +18,10 @@ import struct import dns.edns -import dns.immutable import dns.exception +import dns.immutable import dns.rdata - # We don't implement from_text, and that's ok. # pylint: disable=abstract-method diff --git a/dns/rdtypes/ANY/PTR.py b/dns/rdtypes/ANY/PTR.py index 265bed03..7fd5547d 100644 --- a/dns/rdtypes/ANY/PTR.py +++ b/dns/rdtypes/ANY/PTR.py @@ -15,8 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.nsbase import dns.immutable +import dns.rdtypes.nsbase @dns.immutable.immutable diff --git a/dns/rdtypes/ANY/RP.py b/dns/rdtypes/ANY/RP.py index c0c316b5..9c64c6e2 100644 --- a/dns/rdtypes/ANY/RP.py +++ b/dns/rdtypes/ANY/RP.py @@ -17,8 +17,8 @@ import dns.exception import dns.immutable -import dns.rdata import dns.name +import dns.rdata @dns.immutable.immutable diff --git a/dns/rdtypes/ANY/RRSIG.py b/dns/rdtypes/ANY/RRSIG.py index 3d5ad0f3..11605026 100644 --- a/dns/rdtypes/ANY/RRSIG.py +++ b/dns/rdtypes/ANY/RRSIG.py @@ -21,8 +21,8 @@ import struct import time import dns.dnssectypes -import dns.immutable import dns.exception +import dns.immutable import dns.rdata import dns.rdatatype diff --git a/dns/rdtypes/ANY/RT.py b/dns/rdtypes/ANY/RT.py index 8d9c6bd0..950f2a06 100644 --- a/dns/rdtypes/ANY/RT.py +++ b/dns/rdtypes/ANY/RT.py @@ -15,8 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.mxbase import dns.immutable +import dns.rdtypes.mxbase @dns.immutable.immutable diff --git a/dns/rdtypes/ANY/SOA.py b/dns/rdtypes/ANY/SOA.py index 6f6fe58b..bde55e15 100644 --- a/dns/rdtypes/ANY/SOA.py +++ b/dns/rdtypes/ANY/SOA.py @@ -19,8 +19,8 @@ import struct import dns.exception import dns.immutable -import dns.rdata import dns.name +import dns.rdata @dns.immutable.immutable diff --git a/dns/rdtypes/ANY/SPF.py b/dns/rdtypes/ANY/SPF.py index 1190e0de..c403589a 100644 --- a/dns/rdtypes/ANY/SPF.py +++ b/dns/rdtypes/ANY/SPF.py @@ -15,8 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.txtbase import dns.immutable +import dns.rdtypes.txtbase @dns.immutable.immutable diff --git a/dns/rdtypes/ANY/SSHFP.py b/dns/rdtypes/ANY/SSHFP.py index 58ffcbbc..67805452 100644 --- a/dns/rdtypes/ANY/SSHFP.py +++ b/dns/rdtypes/ANY/SSHFP.py @@ -15,11 +15,11 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import struct import binascii +import struct -import dns.rdata import dns.immutable +import dns.rdata import dns.rdatatype diff --git a/dns/rdtypes/ANY/TKEY.py b/dns/rdtypes/ANY/TKEY.py index 070f03af..d5f5fc45 100644 --- a/dns/rdtypes/ANY/TKEY.py +++ b/dns/rdtypes/ANY/TKEY.py @@ -18,8 +18,8 @@ import base64 import struct -import dns.immutable import dns.exception +import dns.immutable import dns.rdata diff --git a/dns/rdtypes/ANY/TXT.py b/dns/rdtypes/ANY/TXT.py index cc4b6611..f4e61930 100644 --- a/dns/rdtypes/ANY/TXT.py +++ b/dns/rdtypes/ANY/TXT.py @@ -15,8 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.txtbase import dns.immutable +import dns.rdtypes.txtbase @dns.immutable.immutable diff --git a/dns/rdtypes/ANY/URI.py b/dns/rdtypes/ANY/URI.py index b4c95a3b..7463e277 100644 --- a/dns/rdtypes/ANY/URI.py +++ b/dns/rdtypes/ANY/URI.py @@ -20,9 +20,9 @@ import struct import dns.exception import dns.immutable +import dns.name import dns.rdata import dns.rdtypes.util -import dns.name @dns.immutable.immutable diff --git a/dns/rdtypes/ANY/ZONEMD.py b/dns/rdtypes/ANY/ZONEMD.py index 1f86ba49..3062843b 100644 --- a/dns/rdtypes/ANY/ZONEMD.py +++ b/dns/rdtypes/ANY/ZONEMD.py @@ -1,7 +1,7 @@ # Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license -import struct import binascii +import struct import dns.immutable import dns.rdata diff --git a/dns/rdtypes/CH/A.py b/dns/rdtypes/CH/A.py index 9905c7c9..e457f38a 100644 --- a/dns/rdtypes/CH/A.py +++ b/dns/rdtypes/CH/A.py @@ -17,8 +17,8 @@ import struct -import dns.rdtypes.mxbase import dns.immutable +import dns.rdtypes.mxbase @dns.immutable.immutable diff --git a/dns/rdtypes/IN/HTTPS.py b/dns/rdtypes/IN/HTTPS.py index 7797fbaf..15464cbd 100644 --- a/dns/rdtypes/IN/HTTPS.py +++ b/dns/rdtypes/IN/HTTPS.py @@ -1,7 +1,7 @@ # Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license -import dns.rdtypes.svcbbase import dns.immutable +import dns.rdtypes.svcbbase @dns.immutable.immutable diff --git a/dns/rdtypes/IN/IPSECKEY.py b/dns/rdtypes/IN/IPSECKEY.py index 1255739f..8bb2bcb6 100644 --- a/dns/rdtypes/IN/IPSECKEY.py +++ b/dns/rdtypes/IN/IPSECKEY.py @@ -15,8 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import struct import base64 +import struct import dns.exception import dns.immutable diff --git a/dns/rdtypes/IN/KX.py b/dns/rdtypes/IN/KX.py index c27e9215..a03d1d51 100644 --- a/dns/rdtypes/IN/KX.py +++ b/dns/rdtypes/IN/KX.py @@ -15,8 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.mxbase import dns.immutable +import dns.rdtypes.mxbase @dns.immutable.immutable diff --git a/dns/rdtypes/IN/NSAP_PTR.py b/dns/rdtypes/IN/NSAP_PTR.py index 57dadd47..0a18fdce 100644 --- a/dns/rdtypes/IN/NSAP_PTR.py +++ b/dns/rdtypes/IN/NSAP_PTR.py @@ -15,8 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import dns.rdtypes.nsbase import dns.immutable +import dns.rdtypes.nsbase @dns.immutable.immutable diff --git a/dns/rdtypes/IN/PX.py b/dns/rdtypes/IN/PX.py index b2216d6b..5c0aa81e 100644 --- a/dns/rdtypes/IN/PX.py +++ b/dns/rdtypes/IN/PX.py @@ -19,9 +19,9 @@ import struct import dns.exception import dns.immutable +import dns.name import dns.rdata import dns.rdtypes.util -import dns.name @dns.immutable.immutable diff --git a/dns/rdtypes/IN/SRV.py b/dns/rdtypes/IN/SRV.py index 8b0b6bf7..84c54007 100644 --- a/dns/rdtypes/IN/SRV.py +++ b/dns/rdtypes/IN/SRV.py @@ -19,9 +19,9 @@ import struct import dns.exception import dns.immutable +import dns.name import dns.rdata import dns.rdtypes.util -import dns.name @dns.immutable.immutable diff --git a/dns/rdtypes/IN/SVCB.py b/dns/rdtypes/IN/SVCB.py index 9a1ad101..ff3e9327 100644 --- a/dns/rdtypes/IN/SVCB.py +++ b/dns/rdtypes/IN/SVCB.py @@ -1,7 +1,7 @@ # Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license -import dns.rdtypes.svcbbase import dns.immutable +import dns.rdtypes.svcbbase @dns.immutable.immutable diff --git a/dns/rdtypes/IN/WKS.py b/dns/rdtypes/IN/WKS.py index a671e203..26d287a3 100644 --- a/dns/rdtypes/IN/WKS.py +++ b/dns/rdtypes/IN/WKS.py @@ -18,8 +18,8 @@ import socket import struct -import dns.ipv4 import dns.immutable +import dns.ipv4 import dns.rdata try: diff --git a/dns/rdtypes/dnskeybase.py b/dns/rdtypes/dnskeybase.py index 20925149..3bfcf860 100644 --- a/dns/rdtypes/dnskeybase.py +++ b/dns/rdtypes/dnskeybase.py @@ -19,9 +19,9 @@ import base64 import enum import struct +import dns.dnssectypes import dns.exception import dns.immutable -import dns.dnssectypes import dns.rdata # wildcard import diff --git a/dns/rdtypes/dsbase.py b/dns/rdtypes/dsbase.py index 5a4e8c44..1ad0b7a5 100644 --- a/dns/rdtypes/dsbase.py +++ b/dns/rdtypes/dsbase.py @@ -15,8 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import struct import binascii +import struct import dns.dnssectypes import dns.immutable diff --git a/dns/rdtypes/euibase.py b/dns/rdtypes/euibase.py index e524aea9..4c4068b2 100644 --- a/dns/rdtypes/euibase.py +++ b/dns/rdtypes/euibase.py @@ -16,8 +16,8 @@ import binascii -import dns.rdata import dns.immutable +import dns.rdata @dns.immutable.immutable diff --git a/dns/rdtypes/mxbase.py b/dns/rdtypes/mxbase.py index b4b9b088..a6bae078 100644 --- a/dns/rdtypes/mxbase.py +++ b/dns/rdtypes/mxbase.py @@ -21,8 +21,8 @@ import struct import dns.exception import dns.immutable -import dns.rdata import dns.name +import dns.rdata import dns.rdtypes.util diff --git a/dns/rdtypes/nsbase.py b/dns/rdtypes/nsbase.py index ba7a2ab7..56d94235 100644 --- a/dns/rdtypes/nsbase.py +++ b/dns/rdtypes/nsbase.py @@ -19,8 +19,8 @@ import dns.exception import dns.immutable -import dns.rdata import dns.name +import dns.rdata @dns.immutable.immutable diff --git a/dns/rdtypes/tlsabase.py b/dns/rdtypes/tlsabase.py index a3fdc354..4cdb7ab3 100644 --- a/dns/rdtypes/tlsabase.py +++ b/dns/rdtypes/tlsabase.py @@ -15,11 +15,11 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import struct import binascii +import struct -import dns.rdata import dns.immutable +import dns.rdata import dns.rdatatype diff --git a/dns/rdtypes/txtbase.py b/dns/rdtypes/txtbase.py index d4cb9bb2..fdbfb646 100644 --- a/dns/rdtypes/txtbase.py +++ b/dns/rdtypes/txtbase.py @@ -17,9 +17,8 @@ """TXT-like base class.""" -from typing import Any, Dict, Iterable, Optional, Tuple, Union - import struct +from typing import Any, Dict, Iterable, Optional, Tuple, Union import dns.exception import dns.immutable diff --git a/dns/renderer.py b/dns/renderer.py index 3c495f61..53e7c0f6 100644 --- a/dns/renderer.py +++ b/dns/renderer.py @@ -19,14 +19,13 @@ import contextlib import io -import struct import random +import struct import time import dns.exception import dns.tsig - QUESTION = 0 ANSWER = 1 AUTHORITY = 2 diff --git a/dns/resolver.py b/dns/resolver.py index c610eb49..a331e409 100644 --- a/dns/resolver.py +++ b/dns/resolver.py @@ -17,9 +17,6 @@ """DNS stub resolver.""" -from typing import Any, Dict, Iterator, List, Optional, Tuple, Union - -from urllib.parse import urlparse import contextlib import random import socket @@ -27,10 +24,12 @@ import sys import threading import time import warnings +from typing import Any, Dict, Iterator, List, Optional, Tuple, Union +from urllib.parse import urlparse import dns._ddr -import dns.exception import dns.edns +import dns.exception import dns.flags import dns.inet import dns.ipv4 diff --git a/dns/reversename.py b/dns/reversename.py index eb6a3b6b..8236c711 100644 --- a/dns/reversename.py +++ b/dns/reversename.py @@ -19,9 +19,9 @@ import binascii -import dns.name -import dns.ipv6 import dns.ipv4 +import dns.ipv6 +import dns.name ipv4_reverse_domain = dns.name.from_text("in-addr.arpa.") ipv6_reverse_domain = dns.name.from_text("ip6.arpa.") diff --git a/dns/rrset.py b/dns/rrset.py index 0519051e..350de13e 100644 --- a/dns/rrset.py +++ b/dns/rrset.py @@ -17,11 +17,11 @@ """DNS RRsets (an RRset is a named rdataset)""" -from typing import Any, cast, Collection, Dict, Optional, Union +from typing import Any, Collection, Dict, Optional, Union, cast import dns.name -import dns.rdataset import dns.rdataclass +import dns.rdataset import dns.renderer diff --git a/dns/tokenizer.py b/dns/tokenizer.py index 0551578a..454cac4a 100644 --- a/dns/tokenizer.py +++ b/dns/tokenizer.py @@ -17,10 +17,9 @@ """Tokenize DNS zone file format""" -from typing import Any, Optional, List, Tuple - import io import sys +from typing import Any, List, Optional, Tuple import dns.exception import dns.name diff --git a/dns/transaction.py b/dns/transaction.py index 37aa37a8..21dea775 100644 --- a/dns/transaction.py +++ b/dns/transaction.py @@ -1,8 +1,7 @@ # Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license -from typing import Any, Callable, Iterator, List, Optional, Tuple, Union - import collections +from typing import Any, Callable, Iterator, List, Optional, Tuple, Union import dns.exception import dns.name diff --git a/dns/tsig.py b/dns/tsig.py index ca3be590..58760f5f 100644 --- a/dns/tsig.py +++ b/dns/tsig.py @@ -23,9 +23,9 @@ import hmac import struct import dns.exception -import dns.rdataclass import dns.name import dns.rcode +import dns.rdataclass class BadTime(dns.exception.DNSException): diff --git a/dns/tsigkeyring.py b/dns/tsigkeyring.py index 1f8bc5ff..1010a79f 100644 --- a/dns/tsigkeyring.py +++ b/dns/tsigkeyring.py @@ -17,9 +17,8 @@ """A place to store TSIG keys.""" -from typing import Any, Dict - import base64 +from typing import Any, Dict import dns.name import dns.tsig diff --git a/dns/update.py b/dns/update.py index 2219ec56..bf1157ac 100644 --- a/dns/update.py +++ b/dns/update.py @@ -24,8 +24,8 @@ import dns.name import dns.opcode import dns.rdata import dns.rdataclass -import dns.rdatatype import dns.rdataset +import dns.rdatatype import dns.tsig diff --git a/dns/versioned.py b/dns/versioned.py index 67e1659b..fd78e674 100644 --- a/dns/versioned.py +++ b/dns/versioned.py @@ -2,10 +2,9 @@ """DNS Versioned Zones.""" -from typing import Callable, Deque, Optional, Set, Union - import collections import threading +from typing import Callable, Deque, Optional, Set, Union import dns.exception import dns.immutable diff --git a/dns/win32util.py b/dns/win32util.py index f9fda98f..f6b1c6bd 100644 --- a/dns/win32util.py +++ b/dns/win32util.py @@ -17,6 +17,7 @@ if sys.platform == "win32": try: import threading + import pythoncom # pylint: disable=import-error import wmi # pylint: disable=import-error diff --git a/dns/wire.py b/dns/wire.py index cadf1686..9f9b1573 100644 --- a/dns/wire.py +++ b/dns/wire.py @@ -1,9 +1,8 @@ # Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license -from typing import Iterator, Optional, Tuple - import contextlib import struct +from typing import Iterator, Optional, Tuple import dns.exception import dns.name diff --git a/dns/xfr.py b/dns/xfr.py index bb165888..dd247d33 100644 --- a/dns/xfr.py +++ b/dns/xfr.py @@ -21,9 +21,9 @@ import dns.exception import dns.message import dns.name import dns.rcode -import dns.serial import dns.rdataset import dns.rdatatype +import dns.serial import dns.transaction import dns.tsig import dns.zone diff --git a/dns/zone.py b/dns/zone.py index 647538ce..9e763f5f 100644 --- a/dns/zone.py +++ b/dns/zone.py @@ -17,30 +17,29 @@ """DNS Zones.""" -from typing import Any, Dict, Iterator, Iterable, List, Optional, Set, Tuple, Union - import contextlib import io import os import struct +from typing import Any, Dict, Iterable, Iterator, List, Optional, Set, Tuple, Union import dns.exception +import dns.grange import dns.immutable import dns.name import dns.node -import dns.rdataclass -import dns.rdatatype import dns.rdata +import dns.rdataclass import dns.rdataset +import dns.rdatatype import dns.rdtypes.ANY.SOA import dns.rdtypes.ANY.ZONEMD import dns.rrset import dns.tokenizer import dns.transaction import dns.ttl -import dns.grange import dns.zonefile -from dns.zonetypes import DigestScheme, DigestHashAlgorithm, _digest_hashers +from dns.zonetypes import DigestHashAlgorithm, DigestScheme, _digest_hashers class BadZone(dns.exception.DNSException): diff --git a/dns/zonefile.py b/dns/zonefile.py index 563722e6..27f04924 100644 --- a/dns/zonefile.py +++ b/dns/zonefile.py @@ -17,23 +17,22 @@ """DNS Zones.""" -from typing import Any, Iterable, List, Optional, Set, Tuple, Union - import re import sys +from typing import Any, Iterable, List, Optional, Set, Tuple, Union import dns.exception +import dns.grange import dns.name import dns.node +import dns.rdata import dns.rdataclass import dns.rdatatype -import dns.rdata import dns.rdtypes.ANY.SOA import dns.rrset import dns.tokenizer import dns.transaction import dns.ttl -import dns.grange class UnknownOrigin(dns.exception.DNSException): diff --git a/pyproject.toml b/pyproject.toml index 72dbb009..c31efc7b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,3 +76,6 @@ build-backend = "poetry.core.masonry.api" [tool.ruff] ignore = ['E741', 'F401'] + +[tool.isort] +profile = "black" -- 2.47.3