aboutsummaryrefslogtreecommitdiffstats
path: root/pySim-prog.py
diff options
context:
space:
mode:
authorPhilipp Maier <pmaier@sysmocom.de>2019-09-12 12:52:43 +0200
committerPhilipp Maier <pmaier@sysmocom.de>2019-09-13 11:04:13 +0200
commitbe069e26ae6e6d0e6aaa50498f274bddebe8e99e (patch)
tree6a59cf6772678cdea821c109566f106505ccb19d /pySim-prog.py
parent196b08cdfdd6b5ee8c75a86f510514b99dd383d2 (diff)
cards: use string representation for MNC/MCC
At the moment MNC and MCC are represented as integer numbers inside the parameter array while all other parameters are represented as strings. Lets use strings for MNC/MCC as well to simplify the parameter handling. We will also not loose the length information in case of leading zeros. Change-Id: Ia2333921a4863f0f26ee923ca796e62ec5e2d59a
Diffstat (limited to 'pySim-prog.py')
-rwxr-xr-xpySim-prog.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pySim-prog.py b/pySim-prog.py
index ee5bc98..9149709 100755
--- a/pySim-prog.py
+++ b/pySim-prog.py
@@ -432,7 +432,7 @@ def print_parameters(params):
if 'smsp' in params:
s.append(" > SMSP : %(smsp)s")
s.append(" > ICCID : %(iccid)s")
- s.append(" > MCC/MNC : %(mcc)d/%(mnc)d")
+ s.append(" > MCC/MNC : %(mcc)s/%(mnc)s")
s.append(" > IMSI : %(imsi)s")
s.append(" > Ki : %(ki)s")
s.append(" > OPC : %(opc)s")
@@ -483,8 +483,8 @@ def _read_params_csv(opts, iccid=None, imsi=None):
def read_params_csv(opts, imsi=None, iccid=None):
row = _read_params_csv(opts, iccid=iccid, imsi=imsi)
if row is not None:
- row['mcc'] = int(row.get('mcc', row['imsi'][0:3]))
- row['mnc'] = int(row.get('mnc', row['imsi'][3:5]))
+ row['mcc'] = row.get('mcc', row['imsi'][0:3])
+ row['mnc'] = row.get('mnc', row['imsi'][3:5])
pin_adm = None
# We need to escape the pin_adm we get from the csv
if 'pin_adm' in row: