From f579b6f2e78f526c2cc4e87a43c6141d99169a51 Mon Sep 17 00:00:00 2001 From: Fuming Zhang Date: Tue, 22 Nov 2022 14:03:37 +0800 Subject: [PATCH 1/3] add support for bytearray serialization --- knack/output.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knack/output.py b/knack/output.py index a986755..1db12ab 100644 --- a/knack/output.py +++ b/knack/output.py @@ -25,7 +25,7 @@ def _decode_str(output): class _ComplexEncoder(json.JSONEncoder): def default(self, o): # pylint: disable=method-hidden - if isinstance(o, bytes) and not isinstance(o, str): + if (isinstance(o, bytes) or isinstance(o, bytearray)) and not isinstance(o, str): return o.decode() return json.JSONEncoder.default(self, o) From 1aa862ffef6d3f31a69e1e2fa2760c24294ab19a Mon Sep 17 00:00:00 2001 From: Jiashuo Li <4003950+jiasli@users.noreply.github.com> Date: Wed, 30 Nov 2022 15:20:21 +0800 Subject: [PATCH 2/3] Update knack/output.py --- knack/output.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knack/output.py b/knack/output.py index 1db12ab..1547b8b 100644 --- a/knack/output.py +++ b/knack/output.py @@ -25,7 +25,7 @@ def _decode_str(output): class _ComplexEncoder(json.JSONEncoder): def default(self, o): # pylint: disable=method-hidden - if (isinstance(o, bytes) or isinstance(o, bytearray)) and not isinstance(o, str): + if isinstance(o, bytes) or isinstance(o, bytearray): return o.decode() return json.JSONEncoder.default(self, o) From 5d53c3b51f832b5086b2c92f296b7dea2bd950a3 Mon Sep 17 00:00:00 2001 From: Jiashuo Li <4003950+jiasli@users.noreply.github.com> Date: Wed, 30 Nov 2022 15:31:19 +0800 Subject: [PATCH 3/3] Update knack/output.py --- knack/output.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knack/output.py b/knack/output.py index 1547b8b..cb71eff 100644 --- a/knack/output.py +++ b/knack/output.py @@ -25,7 +25,7 @@ def _decode_str(output): class _ComplexEncoder(json.JSONEncoder): def default(self, o): # pylint: disable=method-hidden - if isinstance(o, bytes) or isinstance(o, bytearray): + if isinstance(o, (bytes, bytearray)): return o.decode() return json.JSONEncoder.default(self, o)