<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/18418">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cards: remove empty erase() methods.<br><br>Some of the cards do not implement the erase method that each card<br>should have. However, having an empty method in each of those classes<br>does not make too much sense. Lets rather have an erase method in the<br>superclass (Card) that prints a warning to inform the user that erasing<br>the spcified card is not supported.<br><br>Change-Id: If5add960ec0cab58a01d8f83e6af8cb86ec70a8d<br>---<br>M pySim/cards.py<br>1 file changed, 4 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/18/18418/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 73b0763..c7b34eb 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -37,6 +37,10 @@</span><br><span>        def reset(self):</span><br><span>             self._scc.reset_card()</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    def erase(self):</span><br><span style="color: hsl(120, 100%, 40%);">+              print("warning: erasing is not supported for specified card type!")</span><br><span style="color: hsl(120, 100%, 40%);">+         return</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     def verify_adm(self, key):</span><br><span>           '''</span><br><span>              Authenticate with ADM key</span><br><span>@@ -529,8 +533,6 @@</span><br><span> </span><br><span>          # FIXME: EF.MSISDN</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  def erase(self):</span><br><span style="color: hsl(0, 100%, 40%);">-                return</span><br><span> </span><br><span> class SysmoSIMgr1(GrcardSim):</span><br><span>  """</span><br><span>@@ -575,9 +577,6 @@</span><br><span>                     )</span><br><span>            data, sw = self._scc._tp.send_apdu_checksw("0099000033" + par)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    def erase(self):</span><br><span style="color: hsl(0, 100%, 40%);">-                return</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> </span><br><span> class SysmoSIMgr2(Card):</span><br><span>       """</span><br><span>@@ -653,8 +652,6 @@</span><br><span>             if p.get('smsp'):</span><br><span>                    data, sw = self._scc.update_record('6f42', 1, lpad(p['smsp'], 80))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  def erase(self):</span><br><span style="color: hsl(0, 100%, 40%);">-                return</span><br><span> </span><br><span> class SysmoUSIMSJS1(Card):</span><br><span>     """</span><br><span>@@ -759,9 +756,6 @@</span><br><span>                     r = self._scc.select_file(['3f00', '7f10'])</span><br><span>                  data, sw = self._scc.update_record('6F40', 1, data, force_len=True)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def erase(self):</span><br><span style="color: hsl(0, 100%, 40%);">-                return</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> </span><br><span> class FairwavesSIM(Card):</span><br><span>      """</span><br><span>@@ -903,10 +897,6 @@</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%);">-   def erase(self):</span><br><span style="color: hsl(0, 100%, 40%);">-                return</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> class OpenCellsSim(Card):</span><br><span>  """</span><br><span>   OpenCellsSim</span><br><span>@@ -1046,9 +1036,6 @@</span><br><span> </span><br><span>             return None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def erase(self):</span><br><span style="color: hsl(0, 100%, 40%);">-                return</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> </span><br><span> class SysmoISIMSJA2(Card):</span><br><span>     """</span><br><span>@@ -1169,9 +1156,6 @@</span><br><span> </span><br><span>               return</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      def erase(self):</span><br><span style="color: hsl(0, 100%, 40%);">-                return</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> </span><br><span> # In order for autodetection ...</span><br><span> _cards_classes = [ FakeMagicSim, SuperSim, MagicSim, GrcardSim,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/18418">change 18418</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/+/18418"/><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: If5add960ec0cab58a01d8f83e6af8cb86ec70a8d </div>
<div style="display:none"> Gerrit-Change-Number: 18418 </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>