catarrh/pysim-local
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pySim-prog: rename card_handler to CardHandler

Browse Source 
In OOP, we usually use capital letters for class names. The card handler
class should be no execption.

Change-Id: I4b2c06b1c607c993c9aaf0d57ad2352bb6b36e74
This commit is contained in:
Philipp Maier
2021-09-17 12:35:58 +02:00
parent 82511e5218
commit b18eed072c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pySim-prog.py
View File

@@ -741,9 +741,9 @@ if __name__ == '__main__':
init_batch(opts) init_batch(opts)
if opts.card_handler: if opts.card_handler:
ch = card_handler_auto(sl, opts.card_handler) ch = CardHandlerAuto(sl, opts.card_handler)
else: else:
ch = card_handler(sl) ch = CardHandler(sl)
# Iterate # Iterate
first = True first = True

4
pySim-shell.py
View File

@@ -40,7 +40,7 @@ from pySim.transport import init_reader, ApduTracer, argparse_add_reader_args
from pySim.cards import card_detect, SimCard from pySim.cards import card_detect, SimCard
from pySim.utils import h2b, swap_nibbles, rpad, b2h, h2s, JsonEncoder, bertlv_parse_one from pySim.utils import h2b, swap_nibbles, rpad, b2h, h2s, JsonEncoder, bertlv_parse_one
from pySim.utils import dec_st, sanitize_pin_adm, tabulate_str_list, is_hex, boxed_heading_str from pySim.utils import dec_st, sanitize_pin_adm, tabulate_str_list, is_hex, boxed_heading_str
from pySim.card_handler import card_handler from pySim.card_handler import CardHandler
from pySim.filesystem import CardMF, RuntimeState, CardDF, CardADF from pySim.filesystem import CardMF, RuntimeState, CardDF, CardADF
from pySim.ts_51_011 import CardProfileSIM, DF_TELECOM, DF_GSM from pySim.ts_51_011 import CardProfileSIM, DF_TELECOM, DF_GSM
@@ -484,7 +484,7 @@ if __name__ == '__main__':
sl.wait_for_card(); sl.wait_for_card();
card_handler = card_handler(sl) card_handler = CardHandler(sl)
card = card_detect("auto", scc) card = card_detect("auto", scc)
if card is None: if card is None:

4
pySim/card_handler.py
View File

@@ -27,7 +27,7 @@ import sys
import yaml import yaml
# Manual card handler: User is prompted to insert/remove card from the reader. # Manual card handler: User is prompted to insert/remove card from the reader.
class card_handler: class CardHandler:
sl = None sl = None
@@ -47,7 +47,7 @@ class card_handler:
print("") print("")
# Automatic card handler: A machine is used to handle the cards. # Automatic card handler: A machine is used to handle the cards.
class card_handler_auto: class CardHandlerAuto:
sl = None sl = None
cmds = None cmds = None