<p>dexter <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/25499">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pySim-prog: rename card_handler to CardHandler<br><br>In OOP, we usually use capital letters for class names. The card handler<br>class should be no execption.<br><br>Change-Id: I4b2c06b1c607c993c9aaf0d57ad2352bb6b36e74<br>---<br>M pySim-prog.py<br>M pySim-shell.py<br>M pySim/card_handler.py<br>3 files changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-prog.py b/pySim-prog.py</span><br><span>index 922ca86..3b69bb3 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -741,9 +741,9 @@</span><br><span> init_batch(opts)</span><br><span> </span><br><span> if opts.card_handler:</span><br><span style="color: hsl(0, 100%, 40%);">- ch = card_handler_auto(sl, opts.card_handler)</span><br><span style="color: hsl(120, 100%, 40%);">+ ch = CardHandlerAuto(sl, opts.card_handler)</span><br><span> else:</span><br><span style="color: hsl(0, 100%, 40%);">- ch = card_handler(sl)</span><br><span style="color: hsl(120, 100%, 40%);">+ ch = CardHandler(sl)</span><br><span> </span><br><span> # Iterate</span><br><span> first = True</span><br><span>diff --git a/pySim-shell.py b/pySim-shell.py</span><br><span>index 7977ff5..5644466 100755</span><br><span>--- a/pySim-shell.py</span><br><span>+++ b/pySim-shell.py</span><br><span>@@ -40,7 +40,7 @@</span><br><span> from pySim.cards import card_detect, SimCard</span><br><span> from pySim.utils import h2b, swap_nibbles, rpad, b2h, h2s, JsonEncoder, bertlv_parse_one</span><br><span> from pySim.utils import dec_st, sanitize_pin_adm, tabulate_str_list, is_hex, boxed_heading_str</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.card_handler import card_handler</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.card_handler import CardHandler</span><br><span> </span><br><span> from pySim.filesystem import CardMF, RuntimeState, CardDF, CardADF</span><br><span> from pySim.ts_51_011 import CardProfileSIM, DF_TELECOM, DF_GSM</span><br><span>@@ -484,7 +484,7 @@</span><br><span> </span><br><span> sl.wait_for_card();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- card_handler = card_handler(sl)</span><br><span style="color: hsl(120, 100%, 40%);">+ card_handler = CardHandler(sl)</span><br><span> </span><br><span> card = card_detect("auto", scc)</span><br><span> if card is None:</span><br><span>diff --git a/pySim/card_handler.py b/pySim/card_handler.py</span><br><span>index 9beab51..ef1b071 100644</span><br><span>--- a/pySim/card_handler.py</span><br><span>+++ b/pySim/card_handler.py</span><br><span>@@ -27,7 +27,7 @@</span><br><span> import yaml</span><br><span> </span><br><span> # Manual card handler: User is prompted to insert/remove card from the reader.</span><br><span style="color: hsl(0, 100%, 40%);">-class card_handler:</span><br><span style="color: hsl(120, 100%, 40%);">+class CardHandler:</span><br><span> </span><br><span> sl = None</span><br><span> </span><br><span>@@ -47,7 +47,7 @@</span><br><span> print("")</span><br><span> </span><br><span> # Automatic card handler: A machine is used to handle the cards.</span><br><span style="color: hsl(0, 100%, 40%);">-class card_handler_auto:</span><br><span style="color: hsl(120, 100%, 40%);">+class CardHandlerAuto:</span><br><span> </span><br><span> sl = None</span><br><span> cmds = None</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/25499">change 25499</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/+/25499"/><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: I4b2c06b1c607c993c9aaf0d57ad2352bb6b36e74 </div>
<div style="display:none"> Gerrit-Change-Number: 25499 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>