From: Noel Power Date: Thu, 25 Oct 2018 18:10:30 +0000 (+0100) Subject: python/samba/tests: PY3 Fix str/bytes issue for json.loads X-Git-Tag: tdb-1.3.17~766 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bf82d9f8584673a00529166263b39ff796d1985;p=thirdparty%2Fsamba.git python/samba/tests: PY3 Fix str/bytes issue for json.loads Python 3.4 seems to need a string parsed = json.loads (out_jsobj) File "/usr/lib/python3.4/json/__init__.py", line 312, in loads s.__class__.__name__)) TypeError: the JSON object must be str, not 'bytes' however Python 3.5 seems to be happy to consume bytes (or string) Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/tests/blackbox/netads_json.py b/python/samba/tests/blackbox/netads_json.py index f904a82dfa2..1c254468d36 100644 --- a/python/samba/tests/blackbox/netads_json.py +++ b/python/samba/tests/blackbox/netads_json.py @@ -43,7 +43,7 @@ class BaseWrapper (object): argv = "%s %s --json" % (COMMAND, self.subcmd) try: out = self.check_output(argv) - json.loads (out) + json.loads (get_string(out)) except samba.tests.BlackboxProcessError as e: self.fail("Error calling [%s]: %s" % (argv, e)) @@ -67,7 +67,7 @@ class BaseWrapper (object): except samba.tests.BlackboxProcessError as e: self.fail("Error calling [%s]: %s" % (argv, e)) - parsed = json.loads (out_jsobj) + parsed = json.loads (get_string(out_jsobj)) for key in [ re.match (PLAIN_KEY_REGEX, line).group(1) for line in out_plain.split ("\n")