laforge submitted this change.

View Change


Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified
pySim-shell: fix reset command

The API of the lchan object has changed. It no longer features the reset
method used by the pySim-shell reset command. Let's fix this by using
the reset method of the card object.

Change-Id: I55511d1edb97e8fa014724598ec173dd47fe25c1
---
M pySim-shell.py
1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pySim-shell.py b/pySim-shell.py
index c6782d4..f6cd75d 100755
--- a/pySim-shell.py
+++ b/pySim-shell.py
@@ -50,7 +50,7 @@
from pySim.commands import SimCardCommands
from pySim.transport import init_reader, ApduTracer, argparse_add_reader_args, ProactiveHandler
from pySim.cards import card_detect, SimCard
-from pySim.utils import h2b, swap_nibbles, rpad, b2h, JsonEncoder, bertlv_parse_one, sw_match
+from pySim.utils import h2b, b2h, i2h, swap_nibbles, rpad, JsonEncoder, bertlv_parse_one, sw_match
from pySim.utils import sanitize_pin_adm, tabulate_str_list, boxed_heading_str, Hexstr
from pySim.card_handler import CardHandler, CardHandlerAuto

@@ -736,8 +736,8 @@

def do_reset(self, opts):
"""Reset the Card."""
- atr = self._cmd.lchan.reset(self._cmd)
- self._cmd.poutput('Card ATR: %s' % atr)
+ atr = self._cmd.card.reset()
+ self._cmd.poutput('Card ATR: %s' % i2h(atr))
self._cmd.update_prompt()

def do_desc(self, opts):

To view, visit change 33255. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I55511d1edb97e8fa014724598ec173dd47fe25c1
Gerrit-Change-Number: 33255
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-MessageType: merged