fix encoding bug with new EDNS options; apply black

diff --git a/dns/edns.py b/dns/edns.py
index a60f89cb1636576e4f940f1fd63470fb8c4f9c96..31c1e8b00330d93fd0ccaf00dbd1b950a70f3cab 100644 (file)
--- a/dns/edns.py
+++ b/dns/edns.py
@@ -539,7 +539,7 @@ class EDEExtraTextLanguageOption(Option):
             file.write(self.language.encode("utf8"))
             return None
         else:
-            return self.language
+            return self.language.encode()
 
     def to_text(self) -> str:
         return f"EDE-EXTRA-TEXT-LANGUAGE {self.language}"
@@ -569,7 +569,7 @@ class FilteringContactOption(Option):
             file.write(self.contact.encode("utf8"))
             return None
         else:
-            return self.contact
+            return self.contact.encode()
 
     def to_text(self) -> str:
         return f"FILTERING-CONTACT {self.contact}"
@@ -599,7 +599,7 @@ class FilteringOrganizationOption(Option):
             file.write(self.organization.encode("utf8"))
             return None
         else:
-            return self.organization
+            return self.organization.encode()
 
     def to_text(self) -> str:
         return f"FILTERING-ORGANIZATION {self.organization}"
@@ -633,7 +633,7 @@ class FilteringDBOption(Option):
             file.write(self.db.encode("utf8"))
             return None
         else:
-            return self.db
+            return self.db.encode()
 
     def to_text(self) -> str:
         return f"FILTERING-DB {self.db}"

diff --git a/tests/test_dnssec.py b/tests/test_dnssec.py
index b19950345bf188fada65ceea6512379373973bb0..dd2b44eaa3b474df8749c00274543eb8d6423d3b 100644 (file)
--- a/tests/test_dnssec.py
+++ b/tests/test_dnssec.py
@@ -1251,7 +1251,7 @@ class DNSSECMakeDSTestCase(unittest.TestCase):
                 with self.assertRaises(dns.exception.SyntaxError) as cm:
                     dns.rdata.from_text(dns.rdataclass.IN, dns.rdatatype.CDS, record)
                 # we don't test the message because it varies between pre=3.15 and 3.15
-                #self.assertEqual(msg, str(cm.exception))
+                # self.assertEqual(msg, str(cm.exception))
 
     def testMakeCDS(self):  # type: () -> None
         name = dns.name.from_text("example.com")

diff --git a/tests/test_edns.py b/tests/test_edns.py
index 6bf044eca24874d831f6510e8924f328477b485a..36c1a7b2b271ecb9880882c5251264da1ea7bd65 100644 (file)
--- a/tests/test_edns.py
+++ b/tests/test_edns.py
@@ -277,7 +277,9 @@ class OptionTestCase(unittest.TestCase):
         self.assertEqual(str(opt), "EDE-EXTRA-TEXT-LANGUAGE en")
         opt2 = dns.edns.option_from_wire(
             dns.edns.OptionType.EDE_EXTRA_TEXT_LANGUAGE,
-            expected_wire, 0, len(expected_wire)
+            expected_wire,
+            0,
+            len(expected_wire),
         )
         self.assertEqual(opt2.language, language)
 
@@ -291,8 +293,7 @@ class OptionTestCase(unittest.TestCase):
         self.assertEqual(data, expected_wire)
         self.assertEqual(str(opt), "FILTERING-CONTACT mailto:support@example.com")
         opt2 = dns.edns.option_from_wire(
-            dns.edns.OptionType.FILTERING_CONTACT,
-            expected_wire, 0, len(expected_wire)
+            dns.edns.OptionType.FILTERING_CONTACT, expected_wire, 0, len(expected_wire)
         )
         self.assertEqual(opt2.contact, contact)
 
@@ -307,7 +308,9 @@ class OptionTestCase(unittest.TestCase):
         self.assertEqual(str(opt), "FILTERING-ORGANIZATION The Example Organization")
         opt2 = dns.edns.option_from_wire(
             dns.edns.OptionType.FILTERING_ORGANIZATION,
-            expected_wire, 0, len(expected_wire)
+            expected_wire,
+            0,
+            len(expected_wire),
         )
         self.assertEqual(opt2.organization, organization)
 
@@ -321,8 +324,7 @@ class OptionTestCase(unittest.TestCase):
         self.assertEqual(data, expected_wire)
         self.assertEqual(str(opt), "FILTERING-DB Government Anti-Piracy Policies #1")
         opt2 = dns.edns.option_from_wire(
-            dns.edns.OptionType.FILTERING_DB,
-            expected_wire, 0, len(expected_wire)
+            dns.edns.OptionType.FILTERING_DB, expected_wire, 0, len(expected_wire)
         )
         self.assertEqual(opt2.db, db)
 

diff --git a/tests/test_svcb.py b/tests/test_svcb.py
index c1a8a6abfaf0b3ce84e955f4e0446c8ce6e98ac9..9b217f7d47a1894a95ab487a7caaef29c878a4de 100644 (file)
--- a/tests/test_svcb.py
+++ b/tests/test_svcb.py
@@ -268,7 +268,6 @@ class SVCBTestCase(unittest.TestCase):
         )
         self.check_invalid_inputs(invalid_inputs)
 
-
     def test_svcb_unknown(self):
         valid_inputs_one_key = (
             '1 . key23="key45"',