From 8dbf714e962327aad69242ca2634b0c05da341a5 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Tue, 24 Jan 2023 14:35:19 +0100 Subject: [PATCH] gsm_r: Fix decoding of EF.FN This fixes the below exception when trying to decode records of EF.FN: EXCEPTION of type 'TypeError' occurred with message: 'unsupported operand type(s) for &: 'str' and 'int'' Change-Id: I3723a0d59f862fa818bea1622fe43a7b56c92847 Related: OS#5784 --- pySim/gsm_r.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pySim/gsm_r.py b/pySim/gsm_r.py index ed85c737..5ddb04b9 100644 --- a/pySim/gsm_r.py +++ b/pySim/gsm_r.py @@ -47,10 +47,10 @@ import pySim.ts_51_011 class FuncNTypeAdapter(Adapter): def _decode(self, obj, context, path): bcd = swap_nibbles(b2h(obj)) - last_digit = bcd[-1] + last_digit = int(bcd[-1], 16) return {'functional_number': bcd[:-1], - 'presentation_of_only_this_fn': last_digit & 4, - 'permanent_fn': last_digit & 8} + 'presentation_of_only_this_fn': bool(last_digit & 4), + 'permanent_fn': bool(last_digit & 8)} def _encode(self, obj, context, path): return 'FIXME'