commit ab6897c4cd7f5e0c019f69b2e10ce552bde12127
author Harald Welte <laforge@osmocom.org> Sun Jul 09 16:21:23 2023 +0200
committer Harald Welte <laforge@osmocom.org> Tue Jul 11 08:42:12 2023 +0200
tree 45223041efbfdc436f1f0b32cd7410f5162c3fe8
parent f5e26ae95430a04db4749b6b2fb63d8e555aa6ba

pySim/transport: More type annotations

Change-Id: I62e081271e3a579851a588a4ed7282017e56f852

pySim/transport/serial.py

diff --git a/pySim/transport/serial.py b/pySim/transport/serial.py
index 3313a5e..daf2eb8 100644
--- a/pySim/transport/serial.py
+++ b/pySim/transport/serial.py
@@ -19,10 +19,11 @@
 import serial
 import time
 import os.path
+from typing import Optional, Tuple
 
 from pySim.exceptions import NoCardError, ProtocolError
 from pySim.transport import LinkBase
-from pySim.utils import h2b, b2h
+from pySim.utils import h2b, b2h, Hexstr, SwHexstr
 
 
 class SerialSimLink(LinkBase):
@@ -51,7 +52,7 @@
         if (hasattr(self, "_sl")):
             self._sl.close()
 
-    def wait_for_card(self, timeout=None, newcardonly=False):
+    def wait_for_card(self, timeout: Optional[int] = None, newcardonly: bool = False):
         # Direct try
         existing = False
 
@@ -92,7 +93,7 @@
     def connect(self):
         self.reset_card()
 
-    def get_atr(self):
+    def get_atr(self) -> Hexstr:
         return self._atr
 
     def disconnect(self):
@@ -184,7 +185,7 @@
     def _rx_byte(self):
         return self._sl.read()
 
-    def _send_apdu_raw(self, pdu):
+    def _send_apdu_raw(self, pdu: Hexstr) -> Tuple[Hexstr, SwHexstr]:
 
         pdu = h2b(pdu)
         data_len = pdu[4]  # P3