<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/23702">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">extend JSONEncoder to serialze 'bytes' style objects as hex strings<br><br>This means we can skip a lot of code that manually converts from<br>bytes to hex before JSON serialization.<br><br>Change-Id: I9c9eff0556d9d196e64553b5276e162f69d0c18f<br>---<br>M pySim-shell.py<br>M pySim/utils.py<br>2 files changed, 13 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/02/23702/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-shell.py b/pySim-shell.py</span><br><span>index ce1b3bf..1d81eb8 100755</span><br><span>--- a/pySim-shell.py</span><br><span>+++ b/pySim-shell.py</span><br><span>@@ -39,7 +39,7 @@</span><br><span> from pySim.commands import SimCardCommands</span><br><span> from pySim.transport import init_reader, ApduTracer</span><br><span> from pySim.cards import card_detect, Card</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.utils import h2b, swap_nibbles, rpad, h2s</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.utils import h2b, swap_nibbles, rpad, h2s, JsonEncoder</span><br><span> from pySim.utils import dec_st, sanitize_pin_adm, tabulate_str_list, is_hex</span><br><span> from pySim.card_handler import card_handler</span><br><span> </span><br><span>@@ -81,9 +81,9 @@</span><br><span>    def poutput_json(self, data, force_no_pretty = False):</span><br><span>               """line cmd2.putput() but for a json serializable dict."""</span><br><span>             if force_no_pretty or self.json_pretty_print == False:</span><br><span style="color: hsl(0, 100%, 40%);">-                  output = json.dumps(data)</span><br><span style="color: hsl(120, 100%, 40%);">+                     output = json.dumps(data, cls=JsonEncoder)</span><br><span>           else:</span><br><span style="color: hsl(0, 100%, 40%);">-                   output = json.dumps(data, indent=4)</span><br><span style="color: hsl(120, 100%, 40%);">+                   output = json.dumps(data, cls=JsonEncoder, indent=4)</span><br><span>                 self.poutput(output)</span><br><span> </span><br><span>     def _onchange_numeric_path(self, param_name, old, new):</span><br><span>diff --git a/pySim/utils.py b/pySim/utils.py</span><br><span>index 6a093fa..5f66170 100644</span><br><span>--- a/pySim/utils.py</span><br><span>+++ b/pySim/utils.py</span><br><span>@@ -3,9 +3,12 @@</span><br><span> """ pySim: various utilities</span><br><span> """</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+import json</span><br><span style="color: hsl(120, 100%, 40%);">+from io import BytesIO</span><br><span> from typing import Optional, List, Dict, Any, Tuple</span><br><span> </span><br><span> # Copyright (C) 2009-2010  Sylvain Munaut <tnt@246tNt.com></span><br><span style="color: hsl(120, 100%, 40%);">+# Copyright (C) 2021 Harald Welte <laforge@osmocom.org></span><br><span> #</span><br><span> # This program is free software: you can redistribute it and/or modify</span><br><span> # it under the terms of the GNU General Public License as published by</span><br><span>@@ -831,3 +834,10 @@</span><br><span>          format_str_row = (" " * lspace) + format_str_row</span><br><span>           table.append(format_str_row % tuple(str_list_row))</span><br><span>   return '\n'.join(table)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+class JsonEncoder(json.JSONEncoder):</span><br><span style="color: hsl(120, 100%, 40%);">+    """Extend the standard library JSONEncoder with support for more types."""</span><br><span style="color: hsl(120, 100%, 40%);">+    def default(self, o):</span><br><span style="color: hsl(120, 100%, 40%);">+        if isinstance(o, BytesIO) or isinstance(o, bytes) or isinstance(o, bytearray):</span><br><span style="color: hsl(120, 100%, 40%);">+            return b2h(o)</span><br><span style="color: hsl(120, 100%, 40%);">+        return json.JSONEncoder.default(self, o)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/23702">change 23702</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/pysim/+/23702"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I9c9eff0556d9d196e64553b5276e162f69d0c18f </div>
<div style="display:none"> Gerrit-Change-Number: 23702 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>