From b0681036eb3c946e070f7a97cea89ffce4e6d49f Mon Sep 17 00:00:00 2001 From: Bob Halley Date: Fri, 17 Dec 2021 05:44:23 -0800 Subject: [PATCH] lint --- dns/asyncquery.py | 3 +-- dns/ipv6.py | 6 +++--- dns/rdtypes/ANY/LOC.py | 2 +- dns/rdtypes/IN/WKS.py | 3 +-- dns/rdtypes/util.py | 2 +- dns/resolver.py | 22 +++++++++++----------- dns/zone.py | 10 +++++----- dns/zonefile.py | 3 +-- pylintrc | 2 ++ 9 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dns/asyncquery.py b/dns/asyncquery.py index 0018541d..77936e90 100644 --- a/dns/asyncquery.py +++ b/dns/asyncquery.py @@ -21,7 +21,6 @@ import base64 import socket import struct import time -import urllib import dns.asyncbackend import dns.exception @@ -33,7 +32,7 @@ import dns.rdataclass import dns.rdatatype from dns.query import _compute_times, _matches_destination, BadResponse, ssl, \ - UDPMode, have_doh, _have_httpx, _have_http2, NoDOH + UDPMode, _have_httpx, _have_http2, NoDOH if _have_httpx: import httpx diff --git a/dns/ipv6.py b/dns/ipv6.py index f0e522c0..0db6fcfa 100644 --- a/dns/ipv6.py +++ b/dns/ipv6.py @@ -135,9 +135,9 @@ def inet_aton(text, ignore_scope=False): m = _v4_ending.match(text) if m is not None: b = dns.ipv4.inet_aton(m.group(2)) - text = (u"{}:{:02x}{:02x}:{:02x}{:02x}".format(m.group(1).decode(), - b[0], b[1], b[2], - b[3])).encode() + text = ("{}:{:02x}{:02x}:{:02x}{:02x}".format(m.group(1).decode(), + b[0], b[1], b[2], + b[3])).encode() # # Try to turn '::' into ':'; if no match try to # turn '::' into ':' diff --git a/dns/rdtypes/ANY/LOC.py b/dns/rdtypes/ANY/LOC.py index 1a4ee2bd..c9398994 100644 --- a/dns/rdtypes/ANY/LOC.py +++ b/dns/rdtypes/ANY/LOC.py @@ -55,7 +55,7 @@ def _float_to_tuple(what): what *= -1 else: sign = 1 - what = round(what * 3600000) # pylint: disable=round-builtin + what = round(what * 3600000) degrees = int(what // 3600000) what -= degrees * 3600000 minutes = int(what // 60000) diff --git a/dns/rdtypes/IN/WKS.py b/dns/rdtypes/IN/WKS.py index e9bc33c5..264e45d3 100644 --- a/dns/rdtypes/IN/WKS.py +++ b/dns/rdtypes/IN/WKS.py @@ -47,8 +47,7 @@ class WKS(dns.rdata.Rdata): def to_text(self, origin=None, relativize=True, **kw): bits = [] - for i in range(0, len(self.bitmap)): - byte = self.bitmap[i] + for i, byte in enumerate(self.bitmap): for j in range(0, 8): if byte & (0x80 >> j): bits.append(str(i * 8 + j)) diff --git a/dns/rdtypes/util.py b/dns/rdtypes/util.py index 84a2f35b..9bf8f7e9 100644 --- a/dns/rdtypes/util.py +++ b/dns/rdtypes/util.py @@ -234,7 +234,7 @@ def parse_formatted_hex(formatted, num_chunks, chunk_size, separator): if len(formatted) != num_chunks * (chunk_size + 1) - 1: raise ValueError('invalid formatted hex string') value = b'' - for n in range(num_chunks): + for _ in range(num_chunks): chunk = formatted[0:chunk_size] value += int(chunk, 16).to_bytes(chunk_size // 2, 'big') formatted = formatted[chunk_size:] diff --git a/dns/resolver.py b/dns/resolver.py index d42ccab6..166f8492 100644 --- a/dns/resolver.py +++ b/dns/resolver.py @@ -1286,20 +1286,20 @@ def zone_for_name(name, rdclass=dns.rdataclass.IN, tcp=False, resolver=None, if isinstance(e, dns.resolver.NXDOMAIN): response = e.responses().get(name) else: - response = e.response() + response = e.response() # pylint: disable=no-value-for-parameter if response: for rrs in response.authority: if rrs.rdtype == dns.rdatatype.SOA and \ - rrs.rdclass == rdclass: - (nr, _, _) = rrs.name.fullcompare(name) - if nr == dns.name.NAMERELN_SUPERDOMAIN: - # We're doing a proper superdomain check as - # if the name were equal we ought to have gotten - # it in the answer section! We are ignoring the - # possibility that the authority is insane and - # is including multiple SOA RRs for different - # authorities. - return rrs.name + rrs.rdclass == rdclass: + (nr, _, _) = rrs.name.fullcompare(name) + if nr == dns.name.NAMERELN_SUPERDOMAIN: + # We're doing a proper superdomain check as + # if the name were equal we ought to have gotten + # it in the answer section! We are ignoring the + # possibility that the authority is insane and + # is including multiple SOA RRs for different + # authorities. + return rrs.name # we couldn't extract anything useful from the response (e.g. it's # a type 3 NXDOMAIN) try: diff --git a/dns/zone.py b/dns/zone.py index dc4274a2..8f98a55f 100644 --- a/dns/zone.py +++ b/dns/zone.py @@ -201,13 +201,13 @@ class Zone(dns.transaction.TransactionManager): return self.nodes.__iter__() def keys(self): - return self.nodes.keys() # pylint: disable=dict-keys-not-iterating + return self.nodes.keys() def values(self): - return self.nodes.values() # pylint: disable=dict-values-not-iterating + return self.nodes.values() def items(self): - return self.nodes.items() # pylint: disable=dict-items-not-iterating + return self.nodes.items() def get(self, key): key = self._validate_name(key) @@ -799,7 +799,7 @@ class Zone(dns.transaction.TransactionManager): def _end_write(self, txn): pass - def _commit_version(self, txn, version, origin): + def _commit_version(self, _, version, origin): self.nodes = version.nodes if self.origin is None: self.origin = origin @@ -888,7 +888,7 @@ class Version: return node.get_rdataset(self.zone.rdclass, rdtype, covers) def items(self): - return self.nodes.items() # pylint: disable=dict-items-not-iterating + return self.nodes.items() class WritableVersion(Version): diff --git a/dns/zonefile.py b/dns/zonefile.py index ce16abb4..53b40880 100644 --- a/dns/zonefile.py +++ b/dns/zonefile.py @@ -531,7 +531,7 @@ class RRSetsReaderManager(dns.transaction.TransactionManager): self.rrsets = [] def writer(self, replacement=False): - assert replacement == True + assert replacement is True return RRsetsReaderTransaction(self, True, False) def get_class(self): @@ -622,4 +622,3 @@ def read_rrsets(text, name=None, ttl=None, rdclass=dns.rdataclass.IN, force_rdtype=rdtype, default_ttl=default_ttl) reader.read() return manager.rrsets - diff --git a/pylintrc b/pylintrc index 49306612..6de0fff7 100644 --- a/pylintrc +++ b/pylintrc @@ -30,6 +30,8 @@ disable= redefined-builtin, too-many-lines, raise-missing-from, # we should start doing this, but too noisy for now + consider-using-f-string, + unspecified-encoding, [REPORTS] -- 2.47.3