laforge has submitted this change. (
https://gerrit.osmocom.org/c/pysim/+/34843?usp=email )
Change subject: cards.py: Fix type annotation
......................................................................
cards.py: Fix type annotation
The CardBaes 'scc' member refers to a SimCardCommands instance,
not to a LinkBase.
Change-Id: If4c0dfbd8c9a03d1a0bc4129bb3c5d5fa492d4cb
---
M pySim/cards.py
1 file changed, 17 insertions(+), 6 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
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 @@
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 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 @@
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():
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/34843?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: If4c0dfbd8c9a03d1a0bc4129bb3c5d5fa492d4cb
Gerrit-Change-Number: 34843
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-MessageType: merged
