commit 60951b0c17c5c04e75824d671fe415f84d6b3bb8
author Matan Perelman <matan1008@gmail.com> Thu Jun 01 17:39:04 2023 +0300
committer laforge <laforge@osmocom.org> Wed Jun 07 10:00:07 2023 +0000
tree 170ca88972da375a771547fe7c154cb96230ff3d
parent 777ee9e54d9e26fe1ab507d328409e35509057f3

utils: Remove format_xplmn leading zeros in MNC

Change-Id: I803edafbd892c2b32b884d0b39fed61967a3d68b

pySim/utils.py

diff --git a/pySim/utils.py b/pySim/utils.py
index 537014f..c6362fa 100644
--- a/pySim/utils.py
+++ b/pySim/utils.py
@@ -594,8 +594,8 @@
     plmn_chars = 6
     # first three bytes (six ascii hex chars)
     plmn_str = threehexbytes[:plmn_chars]
-    res['mcc'] = dec_mcc_from_plmn(plmn_str)
-    res['mnc'] = dec_mnc_from_plmn(plmn_str)
+    res['mcc'] = dec_mcc_from_plmn_str(plmn_str)
+    res['mnc'] = dec_mnc_from_plmn_str(plmn_str)
     return res
 
 
@@ -603,11 +603,10 @@
     s = ""
     for rec_data in hexstr_to_Nbytearr(hexstr, 3):
         rec_info = dec_xplmn(rec_data)
-        if rec_info['mcc'] == 0xFFF and rec_info['mnc'] == 0xFFF:
+        if not rec_info['mcc'] and not rec_info['mnc']:
             rec_str = "unused"
         else:
-            rec_str = "MCC: %03d MNC: %03d" % (
-                rec_info['mcc'], rec_info['mnc'])
+            rec_str = "MCC: %s MNC: %s" % (rec_info['mcc'], rec_info['mnc'])
         s += "\t%s # %s\n" % (rec_data, rec_str)
     return s