diff --git a/pySim-shell.py b/pySim-shell.py index 3fc58590..0be6f21f 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -72,15 +72,15 @@ def init_card(sl): sl.wait_for_card(3) except NoCardError: print("No card detected!") - return None, None; + return None, None except: print("Card not readable!") - return None, None; + return None, None card = card_detect("auto", scc) if card is None: print("Could not detect card type!") - return None, None; + return None, None # Create runtime state with card profile profile = CardProfileUICC() @@ -207,7 +207,7 @@ class PysimApp(cmd2.Cmd): @cmd2.with_category(CUSTOM_CATEGORY) def do_equip(self, opts): """Equip pySim-shell with card""" - rs, card = init_card(sl); + rs, card = init_card(sl) self.equip(card, rs) class InterceptStderr(list): @@ -352,7 +352,7 @@ class PysimApp(cmd2.Cmd): except (KeyboardInterrupt): self.poutput("") self.poutput("Terminated by user!") - return; + return except (SystemExit): # When all cards are processed the card handler device will throw a SystemExit # exception. Also Errors that are not recoverable (cards stuck etc.) will end up here. diff --git a/pySim/utils.py b/pySim/utils.py index def88f03..68de14ae 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -133,7 +133,7 @@ def comprehensiontlv_encode_tag(tag) -> bytes: compr = tag.get('comprehension', False) if tag['tag'] in [0x00, 0x80, 0xff] or tag['tag'] > 0xff: # 3-byte format - byte3 = tag['tag'] & 0xff; + byte3 = tag['tag'] & 0xff byte2 = (tag['tag'] >> 8) & 0x7f if compr: byte2 |= 0x80 @@ -243,7 +243,7 @@ def bertlv_encode_tag(t) -> bytes: t |= (cls & 3) << 6 return bytes([t]) else: # multi-byte tag - t = 0x1f; + t = 0x1f if constructed: t |= 0x20 t |= (cls & 3) << 6