laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38300?usp=email )
Change subject: cosmetic: use **kwargs instead of **_kwargs ......................................................................
cosmetic: use **kwargs instead of **_kwargs
Some methods sometimes have a **_kwargs parameter, let's be consistent and use **kwargs only.
Related: OS#5714 Change-Id: I98857cc774185e55a604eb4fbfbf62ed4bd6ded7 --- M pySim/ts_102_221.py M pySim/ts_31_102.py 2 files changed, 7 insertions(+), 7 deletions(-)
Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified
diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index f09b1e3..fa1bd39 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -733,7 +733,7 @@ raise ValueError return by_mode
- def _decode_record_bin(self, raw_bin_data, **_kwargs): + def _decode_record_bin(self, raw_bin_data, **kwargs): # we can only guess if we should decode for EF or DF here :( arr_seq = DataObjectSequence('arr', sequence=[AM_DO_EF, SC_DO]) dec = arr_seq.decode_multi(raw_bin_data) @@ -741,7 +741,7 @@ # 'un-flattening' decoder, and hence would be unable to encode :( return dec[0]
- def _encode_record_bin(self, in_json, **_kwargs): + def _encode_record_bin(self, in_json, **kwargs): # we can only guess if we should decode for EF or DF here :( arr_seq = DataObjectSequence('arr', sequence=[AM_DO_EF, SC_DO]) return arr_seq.encode_multi(in_json) diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index ab5ee54..b82c411 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -405,14 +405,14 @@ desc='Language Indication'): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len)
- def _decode_record_bin(self, in_bin, **_kwargs): + def _decode_record_bin(self, in_bin, **kwargs): if in_bin == b'\xff\xff': return None else: # officially this is 7-bit GSM alphabet with one padding bit in each byte return in_bin.decode('ascii')
- def _encode_record_bin(self, in_json, **_kwargs): + def _encode_record_bin(self, in_json, **kwargs): if in_json is None: return b'\xff\xff' else: @@ -505,7 +505,7 @@ desc='Emergency Call Codes'): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(4, 20))
- def _decode_record_bin(self, in_bin, **_kwargs): + def _decode_record_bin(self, in_bin, **kwargs): # mandatory parts code = in_bin[:3] if code == b'\xff\xff\xff': @@ -519,7 +519,7 @@ ret['alpha_id'] = parse_construct(EF_ECC.alpha_construct, alpha_id) return ret
- def _encode_record_bin(self, in_json, **_kwargs): + def _encode_record_bin(self, in_json, **kwargs): if in_json is None: return b'\xff\xff\xff\xff' code = EF_ECC.cc_construct.build(in_json['call_code']) @@ -682,7 +682,7 @@ def __init__(self, fid='6f65', sfid=None, name='EF.RPLMNAcTD', size=(2, 4), rec_len=2, desc='RPLMN Last used Access Technology', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) - def _decode_record_hex(self, in_hex, **_kwargs): + def _decode_record_hex(self, in_hex, **kwargs): return dec_act(in_hex) # TODO: Encode
-
laforge