<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/25501">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pySim-prog: rename variable card_handler<br><br>The variable card_handler is assigned in the following way:<br><br>card_handler = card_handler(sl)<br><br>This may cause problems since the class name and the variable name are<br>the same. Lets rename card_handler to avoid problems here.<br><br>Change-Id: I84dafc49862e373ae9f6a56bd2e8d1a02c27430a<br>---<br>M pySim-prog.py<br>1 file changed, 9 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/01/25501/1</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 4c85be7..922ca86 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -649,11 +649,11 @@</span><br><span> fh.close()</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def process_card(opts, first, card_handler):</span><br><span style="color: hsl(120, 100%, 40%);">+def process_card(opts, first, ch):</span><br><span> </span><br><span> if opts.dry_run is False:</span><br><span> # Connect transport</span><br><span style="color: hsl(0, 100%, 40%);">- card_handler.get(first)</span><br><span style="color: hsl(120, 100%, 40%);">+ ch.get(first)</span><br><span> </span><br><span> if opts.dry_run is False:</span><br><span> # Get card</span><br><span>@@ -681,13 +681,13 @@</span><br><span> if opts.read_iccid:</span><br><span> if opts.dry_run:</span><br><span> # Connect transport</span><br><span style="color: hsl(0, 100%, 40%);">- card_handler.get(False)</span><br><span style="color: hsl(120, 100%, 40%);">+ ch.get(False)</span><br><span> (res,_) = scc.read_binary(['3f00', '2fe2'], length=10)</span><br><span> iccid = dec_iccid(res)</span><br><span> elif opts.read_imsi:</span><br><span> if opts.dry_run:</span><br><span> # Connect transport</span><br><span style="color: hsl(0, 100%, 40%);">- card_handler.get(False)</span><br><span style="color: hsl(120, 100%, 40%);">+ ch.get(False)</span><br><span> (res,_) = scc.read_binary(EF['IMSI'])</span><br><span> imsi = swap_nibbles(res)[3:]</span><br><span> else:</span><br><span>@@ -713,7 +713,7 @@</span><br><span> opts.num += 1</span><br><span> save_batch(opts)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- card_handler.done()</span><br><span style="color: hsl(120, 100%, 40%);">+ ch.done()</span><br><span> return 0</span><br><span> </span><br><span> </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%);">- card_handler = card_handler_auto(sl, opts.card_handler)</span><br><span style="color: hsl(120, 100%, 40%);">+ ch = card_handler_auto(sl, opts.card_handler)</span><br><span> else:</span><br><span style="color: hsl(0, 100%, 40%);">- card_handler = card_handler(sl)</span><br><span style="color: hsl(120, 100%, 40%);">+ ch = card_handler(sl)</span><br><span> </span><br><span> # Iterate</span><br><span> first = True</span><br><span>@@ -751,7 +751,7 @@</span><br><span> </span><br><span> while 1:</span><br><span> try:</span><br><span style="color: hsl(0, 100%, 40%);">- rc = process_card(opts, first, card_handler)</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = process_card(opts, first, ch)</span><br><span> except (KeyboardInterrupt):</span><br><span> print("")</span><br><span> print("Terminated by user!")</span><br><span>@@ -770,7 +770,7 @@</span><br><span> # Something did not work as well as expected, however, lets</span><br><span> # make sure the card is pulled from the reader.</span><br><span> if rc != 0:</span><br><span style="color: hsl(0, 100%, 40%);">- card_handler.error()</span><br><span style="color: hsl(120, 100%, 40%);">+ ch.error()</span><br><span> </span><br><span> # If we are not in batch mode we are done in any case, so lets</span><br><span> # exit here.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/25501">change 25501</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/+/25501"/><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: I84dafc49862e373ae9f6a56bd2e8d1a02c27430a </div>
<div style="display:none"> Gerrit-Change-Number: 25501 </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>