catarrh/pysim-local
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

transport/init: use PySimLogger to print messages

Browse Source 
The module still uses print to output information. Let's replace
those print calls with the more modern PySimLogger method calls.

Change-Id: I2e2ec2b84f3b84dbd8a029ae9bb64b7a96ddbde3
This commit is contained in:
Philipp Maier
2026-01-06 15:25:19 +01:00
parent 2b42877389
commit a4895702d7
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pySim/transport/__init__.py
View File

@@ -29,6 +29,9 @@ from osmocom.utils import b2h, h2b, i2h, Hexstr
from pySim.exceptions import * from pySim.exceptions import *
from pySim.utils import SwHexstr, SwMatchstr, ResTuple, sw_match, parse_command_apdu from pySim.utils import SwHexstr, SwMatchstr, ResTuple, sw_match, parse_command_apdu
from pySim.cat import ProactiveCommand, CommandDetails, DeviceIdentities, Result from pySim.cat import ProactiveCommand, CommandDetails, DeviceIdentities, Result
from pySim.log import PySimLogger
log = PySimLogger.get(__name__)
class ApduTracer: class ApduTracer:
def trace_command(self, cmd): def trace_command(self, cmd):
@@ -43,11 +46,11 @@ class ApduTracer:
class StdoutApduTracer(ApduTracer): class StdoutApduTracer(ApduTracer):
"""Minimalistic APDU tracer, printing commands to stdout.""" """Minimalistic APDU tracer, printing commands to stdout."""
def trace_response(self, cmd, sw, resp): def trace_response(self, cmd, sw, resp):
print("-> %s %s" % (cmd[:10], cmd[10:])) log.info("-> %s %s", cmd[:10], cmd[10:])
print("<- %s: %s" % (sw, resp)) log.info("<- %s: %s", sw, resp)
def trace_reset(self): def trace_reset(self):
print("-- RESET") log.info("-- RESET")
class ProactiveHandler(abc.ABC): class ProactiveHandler(abc.ABC):
"""Abstract base class representing the interface of some code that handles """Abstract base class representing the interface of some code that handles
@@ -174,7 +177,7 @@ class LinkBase(abc.ABC):
if self.apdu_strict: if self.apdu_strict:
raise ValueError(exeption_str) raise ValueError(exeption_str)
else: else:
print('Warning: %s' % exeption_str) log.warning(exeption_str)
return (data, sw) return (data, sw)
@@ -208,7 +211,7 @@ class LinkBase(abc.ABC):
# parse the proactive command # parse the proactive command
pcmd = ProactiveCommand() pcmd = ProactiveCommand()
parsed = pcmd.from_tlv(h2b(fetch_rv[0])) parsed = pcmd.from_tlv(h2b(fetch_rv[0]))
print("FETCH: %s (%s)" % (fetch_rv[0], type(parsed).__name__)) log.info("FETCH: %s (%s)", fetch_rv[0], type(parsed).__name__)
if self.proactive_handler: if self.proactive_handler:
# Extension point: If this does return a list of TLV objects, # Extension point: If this does return a list of TLV objects,
# they could be appended after the Result; if the first is a # they could be appended after the Result; if the first is a
@@ -358,13 +361,13 @@ def init_reader(opts, **kwargs) -> LinkBase:
from pySim.transport.modem_atcmd import ModemATCommandLink from pySim.transport.modem_atcmd import ModemATCommandLink
sl = ModemATCommandLink(opts, **kwargs) sl = ModemATCommandLink(opts, **kwargs)
else: # Serial reader is default else: # Serial reader is default
print("No reader/driver specified; falling back to default (Serial reader)") log.warning("No reader/driver specified; falling back to default (Serial reader)")
from pySim.transport.serial import SerialSimLink from pySim.transport.serial import SerialSimLink
sl = SerialSimLink(opts, **kwargs) sl = SerialSimLink(opts, **kwargs)
if os.environ.get('PYSIM_INTEGRATION_TEST') == "1": if os.environ.get('PYSIM_INTEGRATION_TEST') == "1":
print("Using %s reader interface" % (sl.name)) log.info("Using %s reader interface" % (sl.name))
else: else:
print("Using reader %s" % sl) log.info("Using reader %s" % sl)
return sl return sl