public/pysim
1
0
Fork 1
mirror of https://gitea.osmocom.org/sim-card/pysim.git synced 2026-03-25 23:08:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

pylint: transport/pcsc.py

Browse Source 
pySim/transport/pcsc.py:26:0: W0404: Reimport 'CardConnectionException' (imported line 26) (reimported)
pySim/transport/pcsc.py:60:4: R1711: Useless return at end of function or method (useless-return)
pySim/transport/pcsc.py:74:12: W0707: Consider explicitly re-raising using 'except CardRequestTimeoutException as exc' and 'raise NoCardError() from exc' (raise-missing-from)
pySim/transport/pcsc.py:86:12: W0707: Consider explicitly re-raising using 'except CardConnectionException as exc' and 'raise ProtocolError() from exc' (raise-missing-from)
pySim/transport/pcsc.py:88:12: W0707: Consider explicitly re-raising using 'except NoCardException as exc' and 'raise NoCardError() from exc' (raise-missing-from)
pySim/transport/pcsc.py:22:0: W0611: Unused Union imported from typing (unused-import)

Change-Id: I0ef440d8825300d6efb8959a67da095ab5623f9c
This commit is contained in:
Harald Welte
2024-02-04 22:39:01 +01:00
parent 181becb676
commit 7781c70c09
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pySim/transport/pcsc.py
View File

@@ -19,11 +19,11 @@
import argparse import argparse
import re import re
from typing import Optional, Union from typing import Optional
from smartcard.CardConnection import CardConnection from smartcard.CardConnection import CardConnection
from smartcard.CardRequest import CardRequest from smartcard.CardRequest import CardRequest
from smartcard.Exceptions import NoCardException, CardRequestTimeoutException, CardConnectionException, CardConnectionException from smartcard.Exceptions import NoCardException, CardRequestTimeoutException, CardConnectionException
from smartcard.System import readers from smartcard.System import readers
from pySim.exceptions import NoCardError, ProtocolError, ReaderError from pySim.exceptions import NoCardError, ProtocolError, ReaderError
@@ -63,15 +63,14 @@ class PcscSimLink(LinkBase):
self._con.disconnect() self._con.disconnect()
except: except:
pass pass
return
def wait_for_card(self, timeout: Optional[int] = None, newcardonly: bool = False): def wait_for_card(self, timeout: Optional[int] = None, newcardonly: bool = False):
cr = CardRequest(readers=[self._reader], cr = CardRequest(readers=[self._reader],
timeout=timeout, newcardonly=newcardonly) timeout=timeout, newcardonly=newcardonly)
try: try:
cr.waitforcard() cr.waitforcard()
except CardRequestTimeoutException: except CardRequestTimeoutException as exc:
raise NoCardError() raise NoCardError() from exc
self.connect() self.connect()
def connect(self): def connect(self):
@@ -82,10 +81,10 @@ class PcscSimLink(LinkBase):
# Explicitly select T=0 communication protocol # Explicitly select T=0 communication protocol
self._con.connect(CardConnection.T0_protocol) self._con.connect(CardConnection.T0_protocol)
except CardConnectionException: except CardConnectionException as exc:
raise ProtocolError() raise ProtocolError() from exc
except NoCardException: except NoCardException as exc:
raise NoCardError() raise NoCardError() from exc
def get_atr(self) -> Hexstr: def get_atr(self) -> Hexstr:
return self._con.getATR() return self._con.getATR()