]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s4/pytest: remove py2 str/bytes workaround in getnc_exop
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Tue, 11 Jun 2024 23:11:27 +0000 (11:11 +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>
source4/torture/drs/python/getnc_exop.py

index 0f12d9b27d7f9f1a4045e12a8aaa6792f836d635..03b9365745819a83bc1a1306b8f5b47e948c5ee3 100644 (file)
@@ -1093,7 +1093,7 @@ class DrsReplicaPrefixMapTestCase(drs_base.DrsBaseTestCase):
         schi = drsuapi.DsReplicaOIDMapping()
         schi.id_prefix = 0
         if 'schemaInfo' in res[0]:
-            binary_oid = [x if isinstance(x, int) else ord(x) for x in res[0]['schemaInfo'][0]]
+            binary_oid = list(res[0]['schemaInfo'][0])
             schi.oid.length = len(binary_oid)
             schi.oid.binary_oid = binary_oid
         else:
@@ -1102,7 +1102,7 @@ class DrsReplicaPrefixMapTestCase(drs_base.DrsBaseTestCase):
             schema_info.marker = 0xFF
             schema_info.invocation_id = misc.GUID(samdb.get_invocation_id())
 
-            binary_oid = [x if isinstance(x, int) else ord(x) for x in ndr_pack(schema_info)]
+            binary_oid = list(ndr_pack(schema_info))
             # you have to set the length before setting binary_oid
             schi.oid.length = len(binary_oid)
             schi.oid.binary_oid = binary_oid