]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
pytest: remove py2 str/bytes workaround in dns_base
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Tue, 11 Jun 2024 23:14:07 +0000 (11:14 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 12 Jun 2024 08:14:34 +0000 (08:14 +0000)
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
python/samba/tests/dns_base.py

index 43a62b1ac5705b4d59d1c4647832426102fd23f7..5fd33ff54dc9b62804d885c2874a374b60a86cb9 100644 (file)
@@ -335,7 +335,7 @@ class DNSTKeyTest(DNSTest):
         (finished, server_to_client) = tkey['gensec'].update(client_to_server)
         self.assertFalse(finished)
 
-        data = [x if isinstance(x, int) else ord(x) for x in list(server_to_client)]
+        data = list(server_to_client)
         rdata.key_data = data
         rdata.key_size = len(data)
         r.rdata = rdata
@@ -428,7 +428,7 @@ class DNSTKeyTest(DNSTest):
 
         data = packet_data + fake_tsig_packet
         mac = self.tkey['gensec'].sign_packet(data, data)
-        mac_list = [x if isinstance(x, int) else ord(x) for x in list(mac)]
+        mac_list = list(mac)
         if bad_sig:
             if len(mac) > 8:
                 mac_list[-8] = mac_list[-8] ^ 0xff