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 <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index 6d8446b72d113a0a2cc1ab5e8ad70fc55e5f7925..c671a762f99bd2f1ce1ab26f68527b095ccf27d2 100644 (file)
--- 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 ""