<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/24141">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cards: get rid of "kls" parameter in autodetect methos<br><br>The autodetect methods have a "kls" parameter as first parameter that<br>somehow replaces the "self" parameter for unknown reason.<br><br>Change-Id: I3e5defee394e1301bad8f04853fab8e9ded84335<br>---<br>M pySim/cards.py<br>1 file changed, 22 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/41/24141/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/cards.py b/pySim/cards.py</span><br><span>index f06aa02..9bbf385 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -503,9 +503,9 @@</span><br><span> _ki_file = None # type: Optional[str]</span><br><span> </span><br><span> @classmethod</span><br><span style="color: hsl(0, 100%, 40%);">- def autodetect(kls, scc):</span><br><span style="color: hsl(120, 100%, 40%);">+ def autodetect(self, scc):</span><br><span> try:</span><br><span style="color: hsl(0, 100%, 40%);">- for p, l, t in kls._files.values():</span><br><span style="color: hsl(120, 100%, 40%);">+ for p, l, t in self._files.values():</span><br><span> if not t:</span><br><span> continue</span><br><span> if scc.record_size(['3f00', '7f4d', p]) != l:</span><br><span>@@ -637,14 +637,14 @@</span><br><span> name = 'fakemagicsim'</span><br><span> </span><br><span> @classmethod</span><br><span style="color: hsl(0, 100%, 40%);">- def autodetect(kls, scc):</span><br><span style="color: hsl(120, 100%, 40%);">+ def autodetect(self, scc):</span><br><span> try:</span><br><span> if scc.record_size(['3f00', '000c']) != 0x5a:</span><br><span> return None</span><br><span> except:</span><br><span> return None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return kls(scc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self(scc)</span><br><span> </span><br><span> def _get_infos(self):</span><br><span> """</span><br><span>@@ -704,7 +704,7 @@</span><br><span> name = 'grcardsim'</span><br><span> </span><br><span> @classmethod</span><br><span style="color: hsl(0, 100%, 40%);">- def autodetect(kls, scc):</span><br><span style="color: hsl(120, 100%, 40%);">+ def autodetect(self, scc):</span><br><span> return None</span><br><span> </span><br><span> def program(self, p):</span><br><span>@@ -762,11 +762,11 @@</span><br><span> name = 'sysmosim-gr1'</span><br><span> </span><br><span> @classmethod</span><br><span style="color: hsl(0, 100%, 40%);">- def autodetect(kls, scc):</span><br><span style="color: hsl(120, 100%, 40%);">+ def autodetect(self, scc):</span><br><span> try:</span><br><span> # Look for ATR</span><br><span> if scc.get_atr() == toBytes("3B 99 18 00 11 88 22 33 44 55 66 77 60"):</span><br><span style="color: hsl(0, 100%, 40%);">- return kls(scc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self(scc)</span><br><span> except:</span><br><span> return None</span><br><span> return None</span><br><span>@@ -778,7 +778,7 @@</span><br><span> name = 'sysmoUSIM-GR1'</span><br><span> </span><br><span> @classmethod</span><br><span style="color: hsl(0, 100%, 40%);">- def autodetect(kls, scc):</span><br><span style="color: hsl(120, 100%, 40%);">+ def autodetect(self, scc):</span><br><span> # TODO: Access the ATR</span><br><span> return None</span><br><span> </span><br><span>@@ -805,11 +805,11 @@</span><br><span> name = 'sysmoSIM-GR2'</span><br><span> </span><br><span> @classmethod</span><br><span style="color: hsl(0, 100%, 40%);">- def autodetect(kls, scc):</span><br><span style="color: hsl(120, 100%, 40%);">+ def autodetect(self, scc):</span><br><span> try:</span><br><span> # Look for ATR</span><br><span> if scc.get_atr() == toBytes("3B 7D 94 00 00 55 55 53 0A 74 86 93 0B 24 7C 4D 54 68"):</span><br><span style="color: hsl(0, 100%, 40%);">- return kls(scc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self(scc)</span><br><span> except:</span><br><span> return None</span><br><span> return None</span><br><span>@@ -885,11 +885,11 @@</span><br><span> self._scc.sel_ctrl = "0004" #request an FCP</span><br><span> </span><br><span> @classmethod</span><br><span style="color: hsl(0, 100%, 40%);">- def autodetect(kls, scc):</span><br><span style="color: hsl(120, 100%, 40%);">+ def autodetect(self, scc):</span><br><span> try:</span><br><span> # Look for ATR</span><br><span> if scc.get_atr() == toBytes("3B 9F 96 80 1F C7 80 31 A0 73 BE 21 13 67 43 20 07 18 00 00 01 A5"):</span><br><span style="color: hsl(0, 100%, 40%);">- return kls(scc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self(scc)</span><br><span> except:</span><br><span> return None</span><br><span> return None</span><br><span>@@ -1012,11 +1012,11 @@</span><br><span> self._adm2_chv_num = 0x12</span><br><span> </span><br><span> @classmethod</span><br><span style="color: hsl(0, 100%, 40%);">- def autodetect(kls, scc):</span><br><span style="color: hsl(120, 100%, 40%);">+ def autodetect(self, scc):</span><br><span> try:</span><br><span> # Look for ATR</span><br><span> if scc.get_atr() == toBytes("3B 9F 96 80 1F C7 80 31 A0 73 BE 21 13 67 44 22 06 10 00 00 01 A9"):</span><br><span style="color: hsl(0, 100%, 40%);">- return kls(scc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self(scc)</span><br><span> except:</span><br><span> return None</span><br><span> return None</span><br><span>@@ -1148,11 +1148,11 @@</span><br><span> </span><br><span> </span><br><span> @classmethod</span><br><span style="color: hsl(0, 100%, 40%);">- def autodetect(kls, scc):</span><br><span style="color: hsl(120, 100%, 40%);">+ def autodetect(self, scc):</span><br><span> try:</span><br><span> # Look for ATR</span><br><span> if scc.get_atr() == toBytes("3B 9F 95 80 1F C3 80 31 E0 73 FE 21 13 57 86 81 02 86 98 44 18 A8"):</span><br><span style="color: hsl(0, 100%, 40%);">- return kls(scc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self(scc)</span><br><span> except:</span><br><span> return None</span><br><span> return None</span><br><span>@@ -1198,11 +1198,11 @@</span><br><span> self._scc.sel_ctrl = "0004" #request an FCP</span><br><span> </span><br><span> @classmethod</span><br><span style="color: hsl(0, 100%, 40%);">- def autodetect(kls, scc):</span><br><span style="color: hsl(120, 100%, 40%);">+ def autodetect(self, scc):</span><br><span> try:</span><br><span> # Look for ATR</span><br><span> if scc.get_atr() == toBytes("3B 9F 95 80 1F C7 80 31 E0 73 F6 21 13 67 4D 45 16 00 43 01 00 8F"):</span><br><span style="color: hsl(0, 100%, 40%);">- return kls(scc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self(scc)</span><br><span> except:</span><br><span> return None</span><br><span> return None</span><br><span>@@ -1289,22 +1289,22 @@</span><br><span> self._scc.sel_ctrl = "0004" #request an FCP</span><br><span> </span><br><span> @classmethod</span><br><span style="color: hsl(0, 100%, 40%);">- def autodetect(kls, scc):</span><br><span style="color: hsl(120, 100%, 40%);">+ def autodetect(self, scc):</span><br><span> try:</span><br><span> # Try card model #1</span><br><span> atr = "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 4C 75 30 34 05 4B A9"</span><br><span> if scc.get_atr() == toBytes(atr):</span><br><span style="color: hsl(0, 100%, 40%);">- return kls(scc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self(scc)</span><br><span> </span><br><span> # Try card model #2</span><br><span> atr = "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 4C 75 31 33 02 51 B2"</span><br><span> if scc.get_atr() == toBytes(atr):</span><br><span style="color: hsl(0, 100%, 40%);">- return kls(scc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self(scc)</span><br><span> </span><br><span> # Try card model #3</span><br><span> atr = "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 4C 52 75 31 04 51 D5"</span><br><span> if scc.get_atr() == toBytes(atr):</span><br><span style="color: hsl(0, 100%, 40%);">- return kls(scc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self(scc)</span><br><span> except:</span><br><span> return None</span><br><span> return None</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/24141">change 24141</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/+/24141"/><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: I3e5defee394e1301bad8f04853fab8e9ded84335 </div>
<div style="display:none"> Gerrit-Change-Number: 24141 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>