diff options
| author | Noel Power <noel.power@suse.com> | 2018-08-08 17:03:48 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-09-03 03:22:20 +0200 |
| commit | 27df0e81c2b79ff4e2a1f990375a7e2a7d210b07 (patch) | |
| tree | a9e48451f2a5c4f8761c48859d9a3bb74d75e167 /python/samba/dbchecker.py | |
| parent | 596db3a5bbca2e93e22a4405d2ad60144bcaf273 (diff) | |
| download | samba-27df0e81c2b79ff4e2a1f990375a7e2a7d210b07.tar.gz | |
python/samba: port changes to allow samba.tests.dsdb_lock to work with PY3/PY2
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python/samba/dbchecker.py')
| -rw-r--r-- | python/samba/dbchecker.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py index ae93ed1c72f..beb664da8f2 100644 --- a/python/samba/dbchecker.py +++ b/python/samba/dbchecker.py @@ -293,7 +293,7 @@ class dbcheck(object): # as the original one, so that on replication we # merge, rather than conflict. proposed_objectguid = dsdb_dn.dn.get_extended_component("GUID") - listwko.append(o) + listwko.append(str(o)) if proposed_objectguid is not None: guid_suffix = "\nobjectGUID: %s" % str(misc.GUID(proposed_objectguid)) @@ -2223,7 +2223,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) values = set() # check for incorrectly normalised attributes for val in obj[attrname]: - values.add(str(val)) + values.add(val) normalised = self.samdb.dsdb_normalise_attributes(self.samdb_schema, attrname, [val]) if len(normalised) != 1 or normalised[0] != val: |