sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-05 12:23:50 +03:00
Code Activity

python compat: remove binary_type

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
This commit is contained in:
Douglas Bagnall
2020-07-04 14:05:16 +12:00
committed by Noel Power
parent bcaf076d30
commit ace5038031
7 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
python/samba/tests/dcerpc/raw_protocol.py
View File

@@ -33,7 +33,6 @@ import samba.dcerpc.lsa
import struct
from samba import gensec
from samba.tests.dcerpc.raw_testcase import RawDCERPCTest
from samba.compat import binary_type
from samba.ntstatus import (
NT_STATUS_SUCCESS
)
@@ -1930,12 +1929,12 @@ class TestDCERPC_BIND(RawDCERPCTest):
epmap=True, return_ack=True)
server = '\\\\' + self.target_hostname
if isinstance(server, binary_type):
if isinstance(server, bytes):
server_utf16 = server.decode('utf-8').encode('utf-16-le')
else:
server_utf16 = server.encode('utf-16-le')
computer = 'UNKNOWNCOMPUTER'
if isinstance(server, binary_type):
if isinstance(server, bytes):
computer_utf16 = computer.decode('utf-8').encode('utf-16-le')
else:
computer_utf16 = computer.encode('utf-16-le')

7
python/samba/tests/dns_base.py
View File

@@ -27,7 +27,6 @@ import random
import socket
import uuid
import time
from samba.compat import binary_type
class DNSTest(TestCaseInTempDir):
@@ -278,7 +277,7 @@ class DNSTKeyTest(DNSTest):
self.assert_dns_rcode_equals(response, dns.DNS_RCODE_OK)
tkey_record = response.answers[0].rdata
server_to_client = binary_type(bytearray(tkey_record.key_data))
server_to_client = bytes(tkey_record.key_data)
(finished, client_to_server) = self.g.update(server_to_client)
self.assertTrue(finished)
@@ -288,7 +287,7 @@ class DNSTKeyTest(DNSTest):
self.assertEqual(response.additional[0].rr_type, dns.DNS_QTYPE_TSIG)
tsig_record = response.additional[0].rdata
mac = binary_type(bytearray(tsig_record.mac))
mac = bytes(tsig_record.mac)
# Cut off tsig record from dns response packet for MAC verification
# and reset additional record count.
@@ -305,7 +304,7 @@ class DNSTKeyTest(DNSTest):
response_packet_list[11] = chr(0)
# convert modified list (of string char or int) to str/bytes
response_packet_wo_tsig = binary_type(bytearray(response_packet_list))
response_packet_wo_tsig = bytes(response_packet_list)
fake_tsig = dns.fake_tsig_rec()
fake_tsig.name = self.key_name