python/samba/netcmd: PY3 fix test samba.tests.samba_tool.passwordsettings

diff --git a/python/samba/netcmd/pso.py b/python/samba/netcmd/pso.py
index a5c74790032c8106a7e27a6a01dd680d42b69f43..200b6ff2a9e812780d2056f1eebb9ebe967b2c1d 100644 (file)
--- a/python/samba/netcmd/pso.py
+++ b/python/samba/netcmd/pso.py
@@ -559,11 +559,9 @@ class cmd_domain_pwdsettings_pso_delete(Command):
         self.message("Deleted PSO %s" % psoname)
 
 
-def pso_cmp(a, b):
-    """Compares two PSO LDB search results"""
+def pso_key(a):
     a_precedence = int(a['msDS-PasswordSettingsPrecedence'][0])
-    b_precedence = int(b['msDS-PasswordSettingsPrecedence'][0])
-    return a_precedence - b_precedence
+    return a_precedence
 
 
 class cmd_domain_pwdsettings_pso_list(Command):
@@ -601,7 +599,7 @@ class cmd_domain_pwdsettings_pso_list(Command):
             return
 
         # sort the PSOs so they're displayed in order of precedence
-        pso_list = sorted(res, cmp=pso_cmp)
+        pso_list = sorted(res, key=pso_key)
 
         self.outf.write("Precedence | PSO name\n")
         self.outf.write("--------------------------------------------------\n")

diff --git a/python/samba/tests/pso.py b/python/samba/tests/pso.py
index 57ec03e62b3929a8f637d998d1c1dd33cbf82b19..af1cd7acaed5653335a6298329daff64d4812677 100644 (file)
--- a/python/samba/tests/pso.py
+++ b/python/samba/tests/pso.py
@@ -84,7 +84,7 @@ class TestUser:
         res = self.ldb.search(self.dn, attrs=['msDS-ResultantPSO'])
 
         if 'msDS-ResultantPSO' in res[0]:
-            return res[0]['msDS-ResultantPSO'][0]
+            return str(res[0]['msDS-ResultantPSO'][0])
         else:
             return None