From: Bob Halley Date: Sat, 26 Jul 2025 15:51:20 +0000 (-0700) Subject: lint X-Git-Tag: v2.8.0rc1~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1165a2f64d35f356d35e151b0e707561f3ca360d;p=thirdparty%2Fdnspython.git lint --- diff --git a/dns/message.py b/dns/message.py index b6cc2103..cd577af9 100644 --- a/dns/message.py +++ b/dns/message.py @@ -1738,7 +1738,7 @@ def from_file( """ if isinstance(f, str): - cm: contextlib.AbstractContextManager = open(f, "rt", encoding="utf-8") + cm: contextlib.AbstractContextManager = open(f, encoding="utf-8") else: cm = contextlib.nullcontext(f) with cm as f: diff --git a/dns/resolver.py b/dns/resolver.py index f7550cae..29133635 100644 --- a/dns/resolver.py +++ b/dns/resolver.py @@ -998,7 +998,7 @@ class BaseResolver: nameservers = [] if isinstance(f, str): try: - cm: contextlib.AbstractContextManager = open(f, "rt", encoding="utf-8") + cm: contextlib.AbstractContextManager = open(f, encoding="utf-8") except OSError: # /etc/resolv.conf doesn't exist, can't be read, etc. raise NoResolverConfiguration(f"cannot open {f}") diff --git a/dns/zone.py b/dns/zone.py index 18039791..b1a52f63 100644 --- a/dns/zone.py +++ b/dns/zone.py @@ -1378,7 +1378,7 @@ def from_file( if isinstance(f, str): if filename is None: filename = f - cm: contextlib.AbstractContextManager = open(f, "rt", encoding="utf-8") + cm: contextlib.AbstractContextManager = open(f, encoding="utf-8") else: cm = contextlib.nullcontext(f) with cm as f: diff --git a/dns/zonefile.py b/dns/zonefile.py index fd0f4642..f7bcb12c 100644 --- a/dns/zonefile.py +++ b/dns/zonefile.py @@ -537,7 +537,7 @@ class Reader: self.default_ttl_known, ) ) - self.current_file = open(filename, "rt", encoding="utf-8") + self.current_file = open(filename, encoding="utf-8") self.tok = dns.tokenizer.Tokenizer(self.current_file, filename) self.current_origin = new_origin elif c == "$GENERATE": diff --git a/tests/test_svcb.py b/tests/test_svcb.py index e92ec453..c62a393e 100644 --- a/tests/test_svcb.py +++ b/tests/test_svcb.py @@ -303,11 +303,11 @@ class SVCBTestCase(unittest.TestCase): def test_svcb_spec_test_vectors(self): text_file = here("svcb_test_vectors.text") text_tokenizer = Tokenizer( - open(text_file, "rt", encoding="utf-8"), filename=text_file + open(text_file, encoding="utf-8"), filename=text_file ) generic_file = here("svcb_test_vectors.generic") generic_tokenizer = Tokenizer( - open(generic_file, "rt", encoding="utf-8"), filename=generic_file + open(generic_file, encoding="utf-8"), filename=generic_file ) while True: diff --git a/tests/test_zone.py b/tests/test_zone.py index 1d7cde35..35b5f42a 100644 --- a/tests/test_zone.py +++ b/tests/test_zone.py @@ -320,8 +320,8 @@ def make_xfr(zone): def compare_files(test_name, a_name, b_name): - with open(a_name, "rt", encoding="utf-8") as a: - with open(b_name, "rt", encoding="utf-8") as b: + with open(a_name, encoding="utf-8") as a: + with open(b_name, encoding="utf-8") as b: differences = list(difflib.unified_diff(a.readlines(), b.readlines())) if len(differences) == 0: return True