diff options
| author | Noel Power <noel.power@suse.com> | 2018-10-25 19:10:30 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-11-14 05:07:17 +0100 |
| commit | 8bf82d9f8584673a00529166263b39ff796d1985 (patch) | |
| tree | 2a374381e1dd8d0ee2ffe60410523598f83bdab7 /python | |
| parent | f176461cf29908f3555eecc2463d00e2ffdc693d (diff) | |
| download | samba-8bf82d9f8584673a00529166263b39ff796d1985.tar.gz | |
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 <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/tests/blackbox/netads_json.py | 4 |
1 files changed, 2 insertions, 2 deletions
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") |