aboutsummaryrefslogtreecommitdiffstats
path: root/pySim/cards.py
diff options
context:
space:
mode:
authorHarald Welte <laforge@osmocom.org>2023-10-21 20:19:32 +0200
committerHarald Welte <laforge@osmocom.org>2023-10-21 21:47:04 +0200
commit79972522677a31258bfe91935a1cd52713edebea (patch)
tree937a880c0092b4ce8decb8c7b1d01e7a1d1191a0 /pySim/cards.py
parent7c0cd0a93b87e1ee52ce6bccdb3a2a7ff3ee7be0 (diff)
cards.py: Fix type annotation
The CardBaes 'scc' member refers to a SimCardCommands instance, not to a LinkBase. Change-Id: If4c0dfbd8c9a03d1a0bc4129bb3c5d5fa492d4cb
Diffstat (limited to 'pySim/cards.py')
-rw-r--r--pySim/cards.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/pySim/cards.py b/pySim/cards.py
index b1adcf2..84f53e1 100644
--- a/pySim/cards.py
+++ b/pySim/cards.py
@@ -25,15 +25,14 @@
from typing import Optional, Dict, Tuple
from pySim.ts_102_221 import EF_DIR
from pySim.ts_51_011 import DF_GSM
-from pySim.transport import LinkBase
import abc
from pySim.utils import *
-from pySim.commands import Path
+from pySim.commands import Path, SimCardCommands
class CardBase:
"""General base class for some kind of telecommunications card."""
- def __init__(self, scc: LinkBase):
+ def __init__(self, scc: SimCardCommands):
self._scc = scc
self._aids = []
@@ -75,7 +74,7 @@ class SimCardBase(CardBase):
any higher-layer processing."""
name = 'SIM'
- def __init__(self, scc: LinkBase):
+ def __init__(self, scc: SimCardCommands):
super(SimCardBase, self).__init__(scc)
self._scc.cla_byte = "A0"
self._scc.sel_ctrl = "0000"
@@ -88,7 +87,7 @@ class SimCardBase(CardBase):
class UiccCardBase(SimCardBase):
name = 'UICC'
- def __init__(self, scc: LinkBase):
+ def __init__(self, scc: SimCardCommands):
super(UiccCardBase, self).__init__(scc)
self._scc.cla_byte = "00"
self._scc.sel_ctrl = "0004" # request an FCP
@@ -162,7 +161,7 @@ class UiccCardBase(SimCardBase):
return self._scc.select_adf(aid)
return (None, None)
-def card_detect(scc: LinkBase) -> Optional[CardBase]:
+def card_detect(scc: SimCardCommands) -> Optional[CardBase]:
# UICC always has higher preference, as a UICC might also contain a SIM application
uicc = UiccCardBase(scc)
if uicc.probe():