From: Bob Halley Date: Fri, 16 Dec 2022 15:50:50 +0000 (-0800) Subject: Fix misc. lint. X-Git-Tag: v2.3.0rc1~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d1fba2c1a123bf430a7b2a598f55ba43ce19244;p=thirdparty%2Fdnspython.git Fix misc. lint. --- diff --git a/dns/exception.py b/dns/exception.py index 0e6245f7..4b1481d1 100644 --- a/dns/exception.py +++ b/dns/exception.py @@ -22,7 +22,7 @@ always be subclasses of ``DNSException``. """ -from typing import Any, Dict, Optional, Set +from typing import Optional, Set class DNSException(Exception): diff --git a/dns/namedict.py b/dns/namedict.py index fe118a35..ca8b1978 100644 --- a/dns/namedict.py +++ b/dns/namedict.py @@ -27,7 +27,8 @@ """DNS name dictionary""" -from collections.abc import MutableMapping +# pylint seems to be confused about this one! +from collections.abc import MutableMapping # pylint: disable=no-name-in-module import dns.name diff --git a/dns/node.py b/dns/node.py index f89c8321..22bbe7cb 100644 --- a/dns/node.py +++ b/dns/node.py @@ -17,7 +17,7 @@ """DNS nodes. A node is a set of rdatasets.""" -from typing import Any, Dict, List, Optional +from typing import Any, Dict, Optional import enum import io diff --git a/dns/query.py b/dns/query.py index 9d6c5f73..0eebefd1 100644 --- a/dns/query.py +++ b/dns/query.py @@ -1070,8 +1070,8 @@ def quic( where: str, timeout: Optional[float] = None, port: int = 853, - source: Optional[str] = None, - source_port: int = 0, + source: Optional[str] = None, # pylint: disable=unused-argument + source_port: int = 0, # pylint: disable=unused-argument one_rr_per_rrset: bool = False, ignore_trailing: bool = False, connection: Optional[dns.quic.SyncQuicConnection] = None, diff --git a/dns/quic/__init__.py b/dns/quic/__init__.py index 88c58624..f48ecf57 100644 --- a/dns/quic/__init__.py +++ b/dns/quic/__init__.py @@ -15,10 +15,15 @@ try: have_quic = True - def null_factory(*args, **kwargs): + def null_factory( + *args, # pylint: disable=unused-argument + **kwargs # pylint: disable=unused-argument + ): return NullContext(None) - def _asyncio_manager_factory(context, *args, **kwargs): + def _asyncio_manager_factory( + context, *args, **kwargs # pylint: disable=unused-argument + ): return AsyncioQuicManager(*args, **kwargs) # We have a context factory and a manager factory as for trio we need to have @@ -28,7 +33,11 @@ try: try: import trio - from dns.quic._trio import TrioQuicManager, TrioQuicConnection, TrioQuicStream + from dns.quic._trio import ( # pylint: disable=ungrouped-imports + TrioQuicManager, + TrioQuicConnection, + TrioQuicStream, + ) def _trio_context_factory(): return trio.open_nursery() diff --git a/dns/quic/_common.py b/dns/quic/_common.py index 2b14c232..d8f6f7fd 100644 --- a/dns/quic/_common.py +++ b/dns/quic/_common.py @@ -4,12 +4,11 @@ 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 -from dns._asyncbackend import NullContext - -from typing import Any QUIC_MAX_DATAGRAM = 2048 diff --git a/dns/quic/_trio.py b/dns/quic/_trio.py index 09b69508..1e47a5a6 100644 --- a/dns/quic/_trio.py +++ b/dns/quic/_trio.py @@ -8,14 +8,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 trio +import dns.inet +from dns._asyncbackend import NullContext from dns.quic._common import ( BaseQuicStream, AsyncQuicConnection, AsyncQuicManager, - NullContext, QUIC_MAX_DATAGRAM, )