Change in pysim[master]: cards: rename class "Card" to "SimCard"

[dexter]

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/24142 )


Change subject: cards: rename class "Card" to "SimCard"
......................................................................

cards: rename class "Card" to "SimCard"

There are the classes IsimCard and UsimCard, which inheret from Card,
which is the base class for a normal non ISIM/USIM simcard. Card also
has methods in it that are related to simcards, so it is not just any
"Card", it is a SimCard and should be called that way.

Change-Id: I2077ded44bc2297b8d478c5bd1895951b494efcc
---
M pySim-read.py
M pySim-shell.py
M pySim/cards.py
3 files changed, 10 insertions(+), 10 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/42/24142/1

diff --git a/pySim-read.py b/pySim-read.py
index ebe0e29..a138698 100755
--- a/pySim-read.py
+++ b/pySim-read.py
@@ -34,7 +34,7 @@
 
 from pySim.commands import SimCardCommands
 from pySim.transport import init_reader, argparse_add_reader_args
-from pySim.cards import card_detect, Card, UsimCard, IsimCard
+from pySim.cards import card_detect, SimCard, UsimCard, IsimCard
 from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, dec_msisdn
 from pySim.utils import format_xplmn_w_act, dec_spn, dec_st, dec_addr_tlv
 from pySim.utils import h2s, format_ePDGSelection
@@ -75,7 +75,7 @@
 	print("Reading ...")
 
 	# Initialize Card object by auto detecting the card
-	card = card_detect("auto", scc) or Card(scc)
+	card = card_detect("auto", scc) or SimCard(scc)
 
 	# Read all AIDs on the UICC
 	card.read_aids()
diff --git a/pySim-shell.py b/pySim-shell.py
index bbfe7e9..8efbf14 100755
--- a/pySim-shell.py
+++ b/pySim-shell.py
@@ -37,7 +37,7 @@
 from pySim.exceptions import *
 from pySim.commands import SimCardCommands
 from pySim.transport import init_reader, ApduTracer, argparse_add_reader_args
-from pySim.cards import card_detect, Card
+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 dec_st, sanitize_pin_adm, tabulate_str_list, is_hex, boxed_heading_str
 from pySim.card_handler import card_handler
diff --git a/pySim/cards.py b/pySim/cards.py
index ac2545e..0fb7357 100644
--- a/pySim/cards.py
+++ b/pySim/cards.py
@@ -32,7 +32,7 @@
 from smartcard.util import toBytes
 from pytlv.TLV import *
 
-class Card(object):
+class SimCard(object):
 
 	name = 'SIM'
 
@@ -283,7 +283,7 @@
 		len = self._scc.record_size(ef)
 		self._scc.update_record(ef, rec_no, "ff" * len, force_len=False, verify=True)
 
-class UsimCard(Card):
+class UsimCard(SimCard):
 
 	name = 'USIM'
 
@@ -479,7 +479,7 @@
 				uiari_recs += "UICC IARI: Can't read, response code = %s\n" % (sw)
 		return uiari_recs
 
-class MagicSimBase(abc.ABC, Card):
+class MagicSimBase(abc.ABC, SimCard):
 	"""
 	Theses cards uses several record based EFs to store the provider infos,
 	each possible provider uses a specific record number in each EF. The
@@ -627,7 +627,7 @@
 	_ki_file = '6f1b'
 
 
-class FakeMagicSim(Card):
+class FakeMagicSim(SimCard):
 	"""
 	Theses cards have a record based EF 3f00/000c that contains the provider
 	information. See the program method for its format. The records go from
@@ -694,7 +694,7 @@
 			self._scc.update_record('000c', 1+i, entry)
 
 
-class GrcardSim(Card):
+class GrcardSim(SimCard):
 	"""
 	Greencard (grcard.cn) HZCOS GSM SIM
 	These cards have a much more regular ISO 7816-4 / TS 11.11 structure,
@@ -797,7 +797,7 @@
 		data, sw = self._scc._tp.send_apdu_checksw("0099000033" + par)
 
 
-class SysmoSIMgr2(Card):
+class SysmoSIMgr2(SimCard):
 	"""
 	sysmocom sysmoSIM-GR2
 	"""
@@ -1134,7 +1134,7 @@
 		self._scc.cla_byte = cla_byte_orig
 		self._scc.sel_ctrl = sel_ctrl_orig
 
-class OpenCellsSim(Card):
+class OpenCellsSim(SimCard):
 	"""
 	OpenCellsSim
 

-- 
To view, visit https://gerrit.osmocom.org/c/pysim/+/24142
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I2077ded44bc2297b8d478c5bd1895951b494efcc
Gerrit-Change-Number: 24142
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210505/85e05cd6/attachment.htm>