<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/23596">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">break circular import between utils + transport<br><br>Move init_reader() from utils.py to transport/__init__.py<br><br>Change-Id: I168597ac14497fb188a15cb632f32452128bc1c6<br>---<br>M pySim-prog.py<br>M pySim-read.py<br>M pySim-shell.py<br>M pySim/transport/__init__.py<br>M pySim/utils.py<br>5 files changed, 35 insertions(+), 32 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/96/23596/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 662824c..7b1283b 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -34,8 +34,9 @@</span><br><span> import json</span><br><span> </span><br><span> from pySim.commands import SimCardCommands</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.transport import init_reader</span><br><span> from pySim.cards import _cards_classes, card_detect</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.utils import h2b, swap_nibbles, rpad, derive_milenage_opc, calculate_luhn, dec_iccid, init_reader</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.utils import h2b, swap_nibbles, rpad, derive_milenage_opc, calculate_luhn, dec_iccid</span><br><span> from pySim.ts_51_011 import EF</span><br><span> from pySim.card_handler import *</span><br><span> from pySim.utils import *</span><br><span>diff --git a/pySim-read.py b/pySim-read.py</span><br><span>index 638bd4b..59c5762 100755</span><br><span>--- a/pySim-read.py</span><br><span>+++ b/pySim-read.py</span><br><span>@@ -33,9 +33,10 @@</span><br><span> from pySim.ts_31_103 import EF_IST_map, EF_ISIM_ADF_map</span><br><span> </span><br><span> from pySim.commands import SimCardCommands</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.transport import init_reader</span><br><span> from pySim.cards import card_detect, Card, UsimCard, IsimCard</span><br><span> from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, dec_msisdn</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.utils import format_xplmn_w_act, dec_spn, dec_st, init_reader, dec_addr_tlv</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.utils import format_xplmn_w_act, dec_spn, dec_st, dec_addr_tlv</span><br><span> from pySim.utils import h2s, format_ePDGSelection</span><br><span> </span><br><span> def parse_options():</span><br><span>diff --git a/pySim-shell.py b/pySim-shell.py</span><br><span>index d27deb7..ef76cb2 100755</span><br><span>--- a/pySim-shell.py</span><br><span>+++ b/pySim-shell.py</span><br><span>@@ -37,9 +37,10 @@</span><br><span> </span><br><span> from pySim.exceptions import *</span><br><span> from pySim.commands import SimCardCommands</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.transport import init_reader</span><br><span> from pySim.cards import card_detect, Card</span><br><span> from pySim.utils import h2b, swap_nibbles, rpad, h2s</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.utils import dec_st, init_reader, sanitize_pin_adm, tabulate_str_list, is_hex</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.utils import dec_st, sanitize_pin_adm, tabulate_str_list, is_hex</span><br><span> from pySim.card_handler import card_handler</span><br><span> </span><br><span> from pySim.filesystem import CardMF, RuntimeState, CardDF, CardADF</span><br><span>diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py</span><br><span>index f946af8..10475c7 100644</span><br><span>--- a/pySim/transport/__init__.py</span><br><span>+++ b/pySim/transport/__init__.py</span><br><span>@@ -3,6 +3,8 @@</span><br><span> """ pySim: PCSC reader transport link base</span><br><span> """</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+from typing import Optional</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> from pySim.exceptions import *</span><br><span> from pySim.utils import sw_match</span><br><span> </span><br><span>@@ -103,3 +105,30 @@</span><br><span> if not sw_match(rv[1], sw):</span><br><span> raise SwMatchError(rv[1], sw.lower())</span><br><span> return rv</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def init_reader(opts) -> Optional[LinkBase]:</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ Init card reader driver</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ sl:Optional[LinkBase] = None</span><br><span style="color: hsl(120, 100%, 40%);">+ try:</span><br><span style="color: hsl(120, 100%, 40%);">+ if opts.pcsc_dev is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Using PC/SC reader interface")</span><br><span style="color: hsl(120, 100%, 40%);">+ from pySim.transport.pcsc import PcscSimLink</span><br><span style="color: hsl(120, 100%, 40%);">+ sl = PcscSimLink(opts.pcsc_dev)</span><br><span style="color: hsl(120, 100%, 40%);">+ elif opts.osmocon_sock is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Using Calypso-based (OsmocomBB) reader interface")</span><br><span style="color: hsl(120, 100%, 40%);">+ from pySim.transport.calypso import CalypsoSimLink</span><br><span style="color: hsl(120, 100%, 40%);">+ sl = CalypsoSimLink(sock_path=opts.osmocon_sock)</span><br><span style="color: hsl(120, 100%, 40%);">+ elif opts.modem_dev is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Using modem for Generic SIM Access (3GPP TS 27.007)")</span><br><span style="color: hsl(120, 100%, 40%);">+ from pySim.transport.modem_atcmd import ModemATCommandLink</span><br><span style="color: hsl(120, 100%, 40%);">+ sl = ModemATCommandLink(device=opts.modem_dev, baudrate=opts.modem_baud)</span><br><span style="color: hsl(120, 100%, 40%);">+ else: # Serial reader is default</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Using serial reader interface")</span><br><span style="color: hsl(120, 100%, 40%);">+ from pySim.transport.serial import SerialSimLink</span><br><span style="color: hsl(120, 100%, 40%);">+ sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)</span><br><span style="color: hsl(120, 100%, 40%);">+ return sl</span><br><span style="color: hsl(120, 100%, 40%);">+ except Exception as e:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Card reader initialization failed with exception:\n" + str(e))</span><br><span style="color: hsl(120, 100%, 40%);">+ return None</span><br><span>diff --git a/pySim/utils.py b/pySim/utils.py</span><br><span>index 8acc0bf..a0d6907 100644</span><br><span>--- a/pySim/utils.py</span><br><span>+++ b/pySim/utils.py</span><br><span>@@ -4,7 +4,6 @@</span><br><span> """</span><br><span> </span><br><span> from typing import Optional, List, Dict, Any, Tuple</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.transport import LinkBase</span><br><span> </span><br><span> # Copyright (C) 2009-2010 Sylvain Munaut <tnt@246tNt.com></span><br><span> #</span><br><span>@@ -654,34 +653,6 @@</span><br><span> </span><br><span> return pin_adm</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def init_reader(opts) -> Optional[LinkBase]:</span><br><span style="color: hsl(0, 100%, 40%);">- """</span><br><span style="color: hsl(0, 100%, 40%);">- Init card reader driver</span><br><span style="color: hsl(0, 100%, 40%);">- """</span><br><span style="color: hsl(0, 100%, 40%);">- sl:Optional[LinkBase] = None</span><br><span style="color: hsl(0, 100%, 40%);">- try:</span><br><span style="color: hsl(0, 100%, 40%);">- if opts.pcsc_dev is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- print("Using PC/SC reader interface")</span><br><span style="color: hsl(0, 100%, 40%);">- 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(0, 100%, 40%);">- elif opts.osmocon_sock is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- print("Using Calypso-based (OsmocomBB) reader interface")</span><br><span style="color: hsl(0, 100%, 40%);">- 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(0, 100%, 40%);">- elif opts.modem_dev is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- print("Using modem for Generic SIM Access (3GPP TS 27.007)")</span><br><span style="color: hsl(0, 100%, 40%);">- 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(0, 100%, 40%);">- else: # Serial reader is default</span><br><span style="color: hsl(0, 100%, 40%);">- print("Using serial reader interface")</span><br><span style="color: hsl(0, 100%, 40%);">- 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(0, 100%, 40%);">- return sl</span><br><span style="color: hsl(0, 100%, 40%);">- except Exception as e:</span><br><span style="color: hsl(0, 100%, 40%);">- print("Card reader initialization failed with exception:\n" + str(e))</span><br><span style="color: hsl(0, 100%, 40%);">- return None</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> def enc_ePDGSelection(hexstr, mcc, mnc, epdg_priority='0001', epdg_fqdn_format='00'):</span><br><span> """</span><br><span> Encode ePDGSelection so it can be stored at EF.ePDGSelection or EF.ePDGSelectionEm.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/23596">change 23596</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/+/23596"/><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: I168597ac14497fb188a15cb632f32452128bc1c6 </div>
<div style="display:none"> Gerrit-Change-Number: 23596 </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>