<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/24142">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cards: rename class "Card" to "SimCard"<br><br>There are the classes IsimCard and UsimCard, which inheret from Card,<br>which is the base class for a normal non ISIM/USIM simcard. Card also<br>has methods in it that are related to simcards, so it is not just any<br>"Card", it is a SimCard and should be called that way.<br><br>Change-Id: I2077ded44bc2297b8d478c5bd1895951b494efcc<br>---<br>M pySim-read.py<br>M pySim-shell.py<br>M pySim/cards.py<br>3 files changed, 11 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-read.py b/pySim-read.py</span><br><span>index 1f2e123..00194b4 100755</span><br><span>--- a/pySim-read.py</span><br><span>+++ b/pySim-read.py</span><br><span>@@ -34,7 +34,7 @@</span><br><span> </span><br><span> from pySim.commands import SimCardCommands</span><br><span> from pySim.transport import init_reader, argparse_add_reader_args</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.cards import card_detect, Card, UsimCard, IsimCard</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.cards import card_detect, SimCard, UsimCard, IsimCard</span><br><span> from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, dec_msisdn</span><br><span> from pySim.utils import format_xplmn_w_act, dec_st</span><br><span> from pySim.utils import h2s, format_ePDGSelection</span><br><span>@@ -75,7 +75,7 @@</span><br><span> print("Reading ...")</span><br><span> </span><br><span> # Initialize Card object by auto detecting the card</span><br><span style="color: hsl(0, 100%, 40%);">- card = card_detect("auto", scc) or Card(scc)</span><br><span style="color: hsl(120, 100%, 40%);">+ card = card_detect("auto", scc) or SimCard(scc)</span><br><span> </span><br><span> # Read all AIDs on the UICC</span><br><span> card.read_aids()</span><br><span>diff --git a/pySim-shell.py b/pySim-shell.py</span><br><span>index 59bfa28..7977ff5 100755</span><br><span>--- a/pySim-shell.py</span><br><span>+++ b/pySim-shell.py</span><br><span>@@ -37,7 +37,7 @@</span><br><span> from pySim.exceptions import *</span><br><span> from pySim.commands import SimCardCommands</span><br><span> from pySim.transport import init_reader, ApduTracer, argparse_add_reader_args</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.cards import card_detect, Card</span><br><span style="color: hsl(120, 100%, 40%);">+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> from pySim.card_handler import card_handler</span><br><span>diff --git a/pySim/cards.py b/pySim/cards.py</span><br><span>index c41f343..c38b185 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -50,7 +50,7 @@</span><br><span> res += "\t%s # %s\n" % (addr_hex, addr)</span><br><span> return res</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class Card(object):</span><br><span style="color: hsl(120, 100%, 40%);">+class SimCard(object):</span><br><span> </span><br><span> name = 'SIM'</span><br><span> </span><br><span>@@ -310,7 +310,7 @@</span><br><span> len = self._scc.record_size(ef)</span><br><span> self._scc.update_record(ef, rec_no, "ff" * len, force_len=False, verify=True)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class UsimCard(Card):</span><br><span style="color: hsl(120, 100%, 40%);">+class UsimCard(SimCard):</span><br><span> </span><br><span> name = 'USIM'</span><br><span> </span><br><span>@@ -388,7 +388,7 @@</span><br><span> (res, sw) = self._scc.update_binary(EF_USIM_ADF_map['UST'], content)</span><br><span> return sw</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class IsimCard(Card):</span><br><span style="color: hsl(120, 100%, 40%);">+class IsimCard(SimCard):</span><br><span> </span><br><span> name = 'ISIM'</span><br><span> </span><br><span>@@ -516,7 +516,7 @@</span><br><span> uiari_recs += "UICC IARI: Can't read, response code = %s\n" % (sw)</span><br><span> return uiari_recs</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class MagicSimBase(abc.ABC, Card):</span><br><span style="color: hsl(120, 100%, 40%);">+class MagicSimBase(abc.ABC, SimCard):</span><br><span> """</span><br><span> Theses cards uses several record based EFs to store the provider infos,</span><br><span> each possible provider uses a specific record number in each EF. The</span><br><span>@@ -664,7 +664,7 @@</span><br><span> _ki_file = '6f1b'</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class FakeMagicSim(Card):</span><br><span style="color: hsl(120, 100%, 40%);">+class FakeMagicSim(SimCard):</span><br><span> """</span><br><span> Theses cards have a record based EF 3f00/000c that contains the provider</span><br><span> information. See the program method for its format. The records go from</span><br><span>@@ -731,7 +731,7 @@</span><br><span> self._scc.update_record('000c', 1+i, entry)</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class GrcardSim(Card):</span><br><span style="color: hsl(120, 100%, 40%);">+class GrcardSim(SimCard):</span><br><span> """</span><br><span> Greencard (grcard.cn) HZCOS GSM SIM</span><br><span> These cards have a much more regular ISO 7816-4 / TS 11.11 structure,</span><br><span>@@ -834,7 +834,7 @@</span><br><span> data, sw = self._scc._tp.send_apdu_checksw("0099000033" + par)</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class SysmoSIMgr2(Card):</span><br><span style="color: hsl(120, 100%, 40%);">+class SysmoSIMgr2(SimCard):</span><br><span> """</span><br><span> sysmocom sysmoSIM-GR2</span><br><span> """</span><br><span>@@ -1157,7 +1157,7 @@</span><br><span> if sw != '9000':</span><br><span> print("Programming ACC failed with code %s"%sw)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class OpenCellsSim(Card):</span><br><span style="color: hsl(120, 100%, 40%);">+class OpenCellsSim(SimCard):</span><br><span> """</span><br><span> OpenCellsSim</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/24142">change 24142</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/+/24142"/><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: I2077ded44bc2297b8d478c5bd1895951b494efcc </div>
<div style="display:none"> Gerrit-Change-Number: 24142 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </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: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>