<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/23697">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">transport: Pass arbitrary kwargs to base-class constructor<br><br>Change-Id: I3cd5ba87cf53409ea97196d5789ed28eef072c68<br>---<br>M pySim/transport/__init__.py<br>M pySim/transport/calypso.py<br>M pySim/transport/modem_atcmd.py<br>M pySim/transport/pcsc.py<br>M pySim/transport/serial.py<br>5 files changed, 15 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/97/23697/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py</span><br><span>index 923787b..c176f8a 100644</span><br><span>--- a/pySim/transport/__init__.py</span><br><span>+++ b/pySim/transport/__init__.py</span><br><span>@@ -28,7 +28,8 @@</span><br><span> class LinkBase(object):</span><br><span> """Base class for link/transport to card."""</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sw_interpreter = None</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, sw_interpreter=None):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.sw_interpreter = sw_interpreter</span><br><span> </span><br><span> def set_sw_interpreter(self, interp):</span><br><span> """Set an (optional) status word interpreter."""</span><br><span>@@ -112,7 +113,7 @@</span><br><span> raise SwMatchError(rv[1], sw.lower(), self.sw_interpreter)</span><br><span> return rv</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def init_reader(opts) -> Optional[LinkBase]:</span><br><span style="color: hsl(120, 100%, 40%);">+def init_reader(opts, **kwargs) -> Optional[LinkBase]:</span><br><span> """</span><br><span> Init card reader driver</span><br><span> """</span><br><span>@@ -121,19 +122,19 @@</span><br><span> if opts.pcsc_dev is not None:</span><br><span> print("Using PC/SC reader interface")</span><br><span> from pySim.transport.pcsc import PcscSimLink</span><br><span style="color: hsl(0, 100%, 40%);">- sl = PcscSimLink(opts.pcsc_dev)</span><br><span style="color: hsl(120, 100%, 40%);">+ sl = PcscSimLink(opts.pcsc_dev, **kwargs)</span><br><span> elif opts.osmocon_sock is not None:</span><br><span> print("Using Calypso-based (OsmocomBB) reader interface")</span><br><span> from pySim.transport.calypso import CalypsoSimLink</span><br><span style="color: hsl(0, 100%, 40%);">- sl = CalypsoSimLink(sock_path=opts.osmocon_sock)</span><br><span style="color: hsl(120, 100%, 40%);">+ sl = CalypsoSimLink(sock_path=opts.osmocon_sock, **kwargs)</span><br><span> elif opts.modem_dev is not None:</span><br><span> print("Using modem for Generic SIM Access (3GPP TS 27.007)")</span><br><span> from pySim.transport.modem_atcmd import ModemATCommandLink</span><br><span style="color: hsl(0, 100%, 40%);">- sl = ModemATCommandLink(device=opts.modem_dev, baudrate=opts.modem_baud)</span><br><span style="color: hsl(120, 100%, 40%);">+ sl = ModemATCommandLink(device=opts.modem_dev, baudrate=opts.modem_baud, **kwargs)</span><br><span> else: # Serial reader is default</span><br><span> print("Using serial reader interface")</span><br><span> from pySim.transport.serial import SerialSimLink</span><br><span style="color: hsl(0, 100%, 40%);">- sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)</span><br><span style="color: hsl(120, 100%, 40%);">+ sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate, **kwargs)</span><br><span> return sl</span><br><span> except Exception as e:</span><br><span> print("Card reader initialization failed with exception:\n" + str(e))</span><br><span>diff --git a/pySim/transport/calypso.py b/pySim/transport/calypso.py</span><br><span>index 3c223e6..b55a089 100644</span><br><span>--- a/pySim/transport/calypso.py</span><br><span>+++ b/pySim/transport/calypso.py</span><br><span>@@ -71,7 +71,8 @@</span><br><span> class CalypsoSimLink(LinkBase):</span><br><span> """Transport Link for Calypso based phones."""</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def __init__(self, sock_path:str = "/tmp/osmocom_l2"):</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, sock_path:str = "/tmp/osmocom_l2", **kwargs):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(**kwargs)</span><br><span> # Make sure that a given socket path exists</span><br><span> if not os.path.exists(sock_path):</span><br><span> raise ReaderError("There is no such ('%s') UNIX socket" % sock_path)</span><br><span>diff --git a/pySim/transport/modem_atcmd.py b/pySim/transport/modem_atcmd.py</span><br><span>index f5a0f23..ecf463c 100644</span><br><span>--- a/pySim/transport/modem_atcmd.py</span><br><span>+++ b/pySim/transport/modem_atcmd.py</span><br><span>@@ -29,7 +29,8 @@</span><br><span> </span><br><span> class ModemATCommandLink(LinkBase):</span><br><span> """Transport Link for 3GPP TS 27.007 compliant modems."""</span><br><span style="color: hsl(0, 100%, 40%);">- def __init__(self, device:str='/dev/ttyUSB0', baudrate:int=115200):</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, device:str='/dev/ttyUSB0', baudrate:int=115200, **kwargs):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(**kwargs)</span><br><span> self._sl = serial.Serial(device, baudrate, timeout=5)</span><br><span> self._device = device</span><br><span> self._atr = None</span><br><span>diff --git a/pySim/transport/pcsc.py b/pySim/transport/pcsc.py</span><br><span>index 2433e79..73a99e8 100644</span><br><span>--- a/pySim/transport/pcsc.py</span><br><span>+++ b/pySim/transport/pcsc.py</span><br><span>@@ -30,7 +30,8 @@</span><br><span> class PcscSimLink(LinkBase):</span><br><span> """ pySim: PCSC reader transport link."""</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def __init__(self, reader_number:int=0):</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, reader_number:int=0, **kwargs):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(**kwargs)</span><br><span> r = readers()</span><br><span> self._reader = r[reader_number]</span><br><span> self._con = self._reader.createConnection()</span><br><span>diff --git a/pySim/transport/serial.py b/pySim/transport/serial.py</span><br><span>index 22788a9..4f2b28f 100644</span><br><span>--- a/pySim/transport/serial.py</span><br><span>+++ b/pySim/transport/serial.py</span><br><span>@@ -29,7 +29,8 @@</span><br><span> """ pySim: Transport Link for serial (RS232) based readers included with simcard"""</span><br><span> </span><br><span> def __init__(self, device:str='/dev/ttyUSB0', baudrate:int=9600, rst:str='-rts',</span><br><span style="color: hsl(0, 100%, 40%);">- debug:bool=False):</span><br><span style="color: hsl(120, 100%, 40%);">+ debug:bool=False, **kwargs):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(**kwargs)</span><br><span> if not os.path.exists(device):</span><br><span> raise ValueError("device file %s does not exist -- abort" % device)</span><br><span> self._sl = serial.Serial(</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/23697">change 23697</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/+/23697"/><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: I3cd5ba87cf53409ea97196d5789ed28eef072c68 </div>
<div style="display:none"> Gerrit-Change-Number: 23697 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>