laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/34961?usp=email ) Change subject: transport: Move printing of reader number/name to generic code ...................................................................... transport: Move printing of reader number/name to generic code Let's avoid copy+pasting print statements everywhere. The instances do already have a __str__ method for the purpose of printing their name in a generic way. Change-Id: I663a9ea69bf7e7aaa6502896b6a71ef692f8d844 --- M pySim/transport/__init__.py M pySim/transport/calypso.py M pySim/transport/modem_atcmd.py M pySim/transport/pcsc.py M pySim/transport/serial.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/fakemagicsim.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmosim-gr1.ok 10 files changed, 25 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/61/34961/1 diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py index e90ced6..f0c788f 100644 --- a/pySim/transport/__init__.py +++ b/pySim/transport/__init__.py @@ -3,6 +3,7 @@ """ pySim: PCSC reader transport link base """ +import os import abc import argparse from typing import Optional, Tuple @@ -301,4 +302,10 @@ from pySim.transport.serial import SerialSimLink sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate, **kwargs) + + if os.environ.get('PYSIM_INTEGRATION_TEST') == "1": + print("Using %s reader interface" % (sl.__class__.__name__)) + else: + print("Using reader %s" % sl) + return sl diff --git a/pySim/transport/calypso.py b/pySim/transport/calypso.py index 98330a9..64e9d0c 100644 --- a/pySim/transport/calypso.py +++ b/pySim/transport/calypso.py @@ -79,10 +79,6 @@ def __init__(self, sock_path: str = "/tmp/osmocom_l2", **kwargs): super().__init__(**kwargs) - if os.environ.get('PYSIM_INTEGRATION_TEST') == "1": - print("Using Calypso-based (OsmocomBB) reader interface") - else: - print("Using Calypso-based (OsmocomBB) reader at socket %s" % sock_path) # Make sure that a given socket path exists if not os.path.exists(sock_path): raise ReaderError( diff --git a/pySim/transport/modem_atcmd.py b/pySim/transport/modem_atcmd.py index 71f76e2..28c30e3 100644 --- a/pySim/transport/modem_atcmd.py +++ b/pySim/transport/modem_atcmd.py @@ -21,7 +21,6 @@ import time import re import argparse -import os from typing import Optional from pySim.utils import Hexstr, ResTuple @@ -37,10 +36,6 @@ def __init__(self, device: str = '/dev/ttyUSB0', baudrate: int = 115200, **kwargs): super().__init__(**kwargs) - if os.environ.get('PYSIM_INTEGRATION_TEST') == "1": - print("Using modem for Generic SIM Access (3GPP TS 27.007)") - else: - print("Using modem for Generic SIM Access (3GPP TS 27.007) at port %s" % device) self._sl = serial.Serial(device, baudrate, timeout=5) self._echo = False # this will be auto-detected by _check_echo() self._device = device diff --git a/pySim/transport/pcsc.py b/pySim/transport/pcsc.py index 4041728..f89cf05 100644 --- a/pySim/transport/pcsc.py +++ b/pySim/transport/pcsc.py @@ -18,7 +18,6 @@ # import argparse -import os import re from typing import Optional @@ -65,11 +64,6 @@ self._con = self._reader.createConnection() - if os.environ.get('PYSIM_INTEGRATION_TEST') == "1": - print("Using PC/SC reader interface") - else: - print("Using PC/SC reader %s" % self) - def __del__(self): try: diff --git a/pySim/transport/serial.py b/pySim/transport/serial.py index ad800ed..d5dc1db 100644 --- a/pySim/transport/serial.py +++ b/pySim/transport/serial.py @@ -33,10 +33,6 @@ def __init__(self, device: str = '/dev/ttyUSB0', baudrate: int = 9600, rst: str = '-rts', debug: bool = False, **kwargs): super().__init__(**kwargs) - if os.environ.get('PYSIM_INTEGRATION_TEST') == "1": - print("Using serial reader interface") - else: - print("Using serial reader interface at port %s" % device) if not os.path.exists(device): raise ValueError("device file %s does not exist -- abort" % device) self._sl = serial.Serial( diff --git a/pysim-testdata/Fairwaves-SIM.ok b/pysim-testdata/Fairwaves-SIM.ok index 063fc6b..35af941 100644 --- a/pysim-testdata/Fairwaves-SIM.ok +++ b/pysim-testdata/Fairwaves-SIM.ok @@ -1,4 +1,4 @@ -Using PC/SC reader interface +Using PcscSimLink reader interface Reading ... Autodetected card type: Fairwaves-SIM ICCID: 8988219000000117833 diff --git a/pysim-testdata/Wavemobile-SIM.ok b/pysim-testdata/Wavemobile-SIM.ok index 980332f..adecac6 100644 --- a/pysim-testdata/Wavemobile-SIM.ok +++ b/pysim-testdata/Wavemobile-SIM.ok @@ -1,4 +1,4 @@ -Using PC/SC reader interface +Using PcscSimLink reader interface Reading ... Autodetected card type: Wavemobile-SIM ICCID: 89445310150011013678 diff --git a/pysim-testdata/fakemagicsim.ok b/pysim-testdata/fakemagicsim.ok index 4c366f9..009fdc8 100644 --- a/pysim-testdata/fakemagicsim.ok +++ b/pysim-testdata/fakemagicsim.ok @@ -1,4 +1,4 @@ -Using PC/SC reader interface +Using PcscSimLink reader interface Reading ... Autodetected card type: fakemagicsim ICCID: 1122334455667788990 diff --git a/pysim-testdata/sysmoISIM-SJA2.ok b/pysim-testdata/sysmoISIM-SJA2.ok index 45acd79..468ec50 100644 --- a/pysim-testdata/sysmoISIM-SJA2.ok +++ b/pysim-testdata/sysmoISIM-SJA2.ok @@ -1,4 +1,4 @@ -Using PC/SC reader interface +Using PcscSimLink reader interface Reading ... Autodetected card type: sysmoISIM-SJA2 ICCID: 8988211000000467343 diff --git a/pysim-testdata/sysmosim-gr1.ok b/pysim-testdata/sysmosim-gr1.ok index 70ac763..447d4e5 100644 --- a/pysim-testdata/sysmosim-gr1.ok +++ b/pysim-testdata/sysmosim-gr1.ok @@ -1,4 +1,4 @@ -Using PC/SC reader interface +Using PcscSimLink reader interface Reading ... Autodetected card type: sysmosim-gr1 ICCID: 1122334455667788990 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34961?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I663a9ea69bf7e7aaa6502896b6a71ef692f8d844 Gerrit-Change-Number: 34961 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge@osmocom.org> Gerrit-MessageType: newchange