From 2c0f7f07c60209cd3e32b9f17737e72fcc02fdc9 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Wed, 10 Oct 2018 11:18:13 +0100 Subject: [PATCH] python/samba/netcmd: PY3 make sure get_testparm_var returns 'str' part of PY3 port samba4.blackbox.upgrade.samba3-upgrade* Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett --- python/samba/netcmd/domain.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index 6d8446b72d1..c671a762f99 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -103,6 +103,7 @@ from samba.netcmd.pso import cmd_domain_passwordsettings_pso from samba.netcmd.domain_backup import cmd_domain_backup from samba.compat import binary_type +from samba.compat import get_string string_version_to_constant = { "2008_R2": DS_DOMAIN_FUNCTION_2008_R2, @@ -153,9 +154,9 @@ def get_testparm_var(testparm, smbconf, varname): stdout=subprocess.PIPE, stderr=errfile) (out, err) = p.communicate() errfile.close() - lines = out.split('\n') + lines = out.split(b'\n') if lines: - return lines[0].strip() + return get_string(lines[0]).strip() return "" -- 2.34.1