February 2024 - gerrit-log - lists.osmocom.org

[M] Change in pysim[master]: pylint: global_platform/__init__.py

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35852?usp=email ) Change subject: pylint: global_platform/__init__.py ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35852?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iea6afb5e72e035637e761bb25535f48fd4bc99f4 Gerrit-Change-Number: 35852 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 05 Feb 2024 17:10:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in pysim[master]: pylint: construct.py

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35851?usp=email ) Change subject: pylint: construct.py ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35851?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic8a06d65a7bcff9ef399fe4e7e5d82f271c946bb Gerrit-Change-Number: 35851 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 05 Feb 2024 17:10:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in pysim[master]: pylint: apdu/ts_102_221.py

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35841?usp=email ) Change subject: pylint: apdu/ts_102_221.py ...................................................................... pylint: apdu/ts_102_221.py pySim/apdu/ts_102_221.py:60:16: R1724: Unnecessary "else" after "continue", remove the "else" and de-indent the code inside it (no-else-continue) pySim/apdu/ts_102_221.py:107:16: W0107: Unnecessary pass statement (unnecessary-pass) pySim/apdu/ts_102_221.py:294:8: R1703: The if statement can be replaced with 'return bool(test)' (simplifiable-if-statement) pySim/apdu/ts_102_221.py:294:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/apdu/ts_102_221.py:299:31: W0613: Unused argument 'lchan' (unused-argument) ... pySim/apdu/ts_102_221.py:389:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/apdu/ts_102_221.py:421:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/apdu/ts_102_221.py:425:12: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/apdu/ts_102_221.py:438:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/apdu/ts_102_221.py:26:0: C0411: standard import "from typing import Optional, Dict, Tuple" should be placed before "from construct import GreedyRange, Struct" (wrong-import-order) Change-Id: Id5caac8da4c965dbaf88d624cdc9dcc8fc168b8c --- M pySim/apdu/ts_102_221.py 1 file changed, 36 insertions(+), 19 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/apdu/ts_102_221.py b/pySim/apdu/ts_102_221.py index 48401c0..6e14b8a 100644 --- a/pySim/apdu/ts_102_221.py +++ b/pySim/apdu/ts_102_221.py @@ -17,13 +17,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. """ +from typing import Optional, Dict import logging + from construct import GreedyRange, Struct + from pySim.construct import * from pySim.filesystem import * from pySim.runtime import RuntimeLchan from pySim.apdu import ApduCommand, ApduCommandSet -from typing import Optional, Dict, Tuple logger = logging.getLogger(__name__) @@ -104,7 +106,6 @@ #print("\tSELECT AID %s" % adf) else: logger.warning('SELECT UNKNOWN AID %s', aid) - pass else: raise ValueError('Select Mode %s not implemented' % mode) # decode the SELECT response @@ -291,12 +292,9 @@ @staticmethod def _pin_is_success(sw): - if sw[0] == 0x63: - return True - else: - return False + return bool(sw[0] == 0x63) - def process_on_lchan(self, lchan: RuntimeLchan): + def process_on_lchan(self, _lchan: RuntimeLchan): return VerifyPin._pin_process(self) def _is_success(self): @@ -308,7 +306,7 @@ _apdu_case = 3 _construct_p2 = PinConstructP2 - def process_on_lchan(self, lchan: RuntimeLchan): + def process_on_lchan(self, _lchan: RuntimeLchan): return VerifyPin._pin_process(self) def _is_success(self): @@ -320,7 +318,7 @@ _apdu_case = 3 _construct_p2 = PinConstructP2 - def process_on_lchan(self, lchan: RuntimeLchan): + def process_on_lchan(self, _lchan: RuntimeLchan): return VerifyPin._pin_process(self) def _is_success(self): @@ -331,7 +329,7 @@ class EnablePin(ApduCommand, n='ENABLE PIN', ins=0x28, cla=['0X', '4X', '6X']): _apdu_case = 3 _construct_p2 = PinConstructP2 - def process_on_lchan(self, lchan: RuntimeLchan): + def process_on_lchan(self, _lchan: RuntimeLchan): return VerifyPin._pin_process(self) def _is_success(self): @@ -343,7 +341,7 @@ _apdu_case = 3 _construct_p2 = PinConstructP2 - def process_on_lchan(self, lchan: RuntimeLchan): + def process_on_lchan(self, _lchan: RuntimeLchan): return VerifyPin._pin_process(self) def _is_success(self): @@ -396,13 +394,12 @@ manage_channel.add_lchan(created_channel_nr) self.col_id = '%02u' % created_channel_nr return {'mode': mode, 'created_channel': created_channel_nr } - elif mode == 'close_channel': + if mode == 'close_channel': closed_channel_nr = self.cmd_dict['p2']['logical_channel_number'] rs.del_lchan(closed_channel_nr) self.col_id = '%02u' % closed_channel_nr return {'mode': mode, 'closed_channel': closed_channel_nr } - else: - raise ValueError('Unsupported MANAGE CHANNEL P1=%02X' % self.p1) + raise ValueError('Unsupported MANAGE CHANNEL P1=%02X' % self.p1) # TS 102 221 Section 11.1.18 class GetChallenge(ApduCommand, n='GET CHALLENGE', ins=0x84, cla=['0X', '4X', '6X']): @@ -420,13 +417,13 @@ p2 = hdr[3] if p1 & 0x7 == 0: # retrieve UICC Endpoints return 2 - elif p1 & 0xf in [1,2,3]: # establish sa, start secure channel SA + if p1 & 0xf in [1,2,3]: # establish sa, start secure channel SA p2_cmd = p2 >> 5 if p2_cmd in [0,2,4]: # command data return 3 - elif p2_cmd in [1,3,5]: # response data + if p2_cmd in [1,3,5]: # response data return 2 - elif p1 & 0xf == 4: # terminate secure channel SA + if p1 & 0xf == 4: # terminate secure channel SA return 3 raise ValueError('%s: Unable to detect APDU case for %s' % (cls.__name__, b2h(hdr))) @@ -437,8 +434,7 @@ p1 = hdr[2] if p1 & 0x04: return 3 - else: - return 2 + return 2 # TS 102 221 Section 11.1.22 class SuspendUicc(ApduCommand, n='SUSPEND UICC', ins=0x76, cla=['80']): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35841?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id5caac8da4c965dbaf88d624cdc9dcc8fc168b8c Gerrit-Change-Number: 35841 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in pysim[master]: pylint: ts_102_221.py

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35842?usp=email ) Change subject: pylint: ts_102_221.py ...................................................................... pylint: ts_102_221.py pySim/ts_102_221.py:20:0: W0622: Redefining built-in 'BlockingIOError' (redefined-builtin) pySim/ts_102_221.py:30:0: R0402: Use 'from pySim import iso7816_4' instead (consider-using-from-import) pySim/ts_102_221.py:20:0: W0401: Wildcard import construct (wildcard-import) pySim/ts_102_221.py:235:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/ts_102_221.py:272:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/ts_102_221.py:281:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/ts_102_221.py:484:12: W0715: Exception arguments suggest string formatting might be intended (raising-format-tuple) pySim/ts_102_221.py:486:12: W0715: Exception arguments suggest string formatting might be intended (raising-format-tuple) pySim/ts_102_221.py:488:12: W0715: Exception arguments suggest string formatting might be intended (raising-format-tuple) pySim/ts_102_221.py:523:11: C1802: Do not use `len(SEQUENCE)` without comparison to determine if a sequence is empty (use-implicit-booleaness-not-len) pySim/ts_102_221.py:647:0: W0613: Unused argument 'kwargs' (unused-argument) pySim/ts_102_221.py:747:19: W0612: Unused variable 'sw' (unused-variable) pySim/ts_102_221.py:26:0: C0411: third party import "from bidict import bidict" should be placed before "from pySim.construct import *" (wrong-import-order) pySim/ts_102_221.py:27:0: C0412: Imports from package pySim are not grouped (ungrouped-imports) pySim/ts_102_221.py:29:0: W0611: Unused match_sim imported from pySim.profile (unused-import) pySim/ts_102_221.py:34:0: W0611: Unused DF_GSM imported from pySim.ts_51_011 (unused-import) pySim/ts_102_221.py:34:0: W0611: Unused DF_TELECOM imported from pySim.ts_51_011 (unused-import) Change-Id: I99d408bdf2551527f097a04240e857728b738621 --- M pySim/ts_102_221.py 1 file changed, 49 insertions(+), 27 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 65dd87d..37b7856 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -16,22 +16,22 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. """ +from bidict import bidict -from construct import * +from construct import Select, Const, Bit, Struct, Int16ub, FlagsEnum, GreedyString, ValidationError from construct import Optional as COptional + from pySim.construct import * from pySim.utils import * from pySim.filesystem import * from pySim.tlv import * -from bidict import bidict from pySim.profile import CardProfile from pySim.profile import match_uicc -from pySim.profile import match_sim -import pySim.iso7816_4 as iso7816_4 +from pySim import iso7816_4 # A UICC will usually also support 2G functionality. If this is the case, we # need to add DF_GSM and DF_TELECOM along with the UICC related files -from pySim.ts_51_011 import DF_GSM, DF_TELECOM, AddonSIM +from pySim.ts_51_011 import AddonSIM from pySim.gsm_r import AddonGSMR from pySim.cdma_ruim import AddonRUIM @@ -234,20 +234,19 @@ def _to_bytes(self): if self.decoded == 'no_information': return b'\x00' - elif self.decoded == 'creation': + if self.decoded == 'creation': return b'\x01' - elif self.decoded == 'initialization': + if self.decoded == 'initialization': return b'\x03' - elif self.decoded == 'operational_activated': + if self.decoded == 'operational_activated': return b'\x05' - elif self.decoded == 'operational_deactivated': + if self.decoded == 'operational_deactivated': return b'\x04' - elif self.decoded == 'termination': + if self.decoded == 'termination': return b'\x0c' - elif isinstance(self.decoded, int): + if isinstance(self.decoded, int): return self.decoded.to_bytes(1, 'big') - else: - raise ValueError + raise ValueError # ETSI TS 102 221 11.1.1.4.9 class PS_DO(BER_TLV_IE, tag=0x90): @@ -481,12 +480,11 @@ def from_bytes(self, do: bytes): """Decode a Control Reference Template DO.""" if len(do) != 6: - raise ValueError('Unsupported CRT DO length: %s', do) + raise ValueError('Unsupported CRT DO length: %s' %do) if do[0] != 0x83 or do[1] != 0x01: - raise ValueError('Unsupported Key Ref Tag or Len in CRT DO %s', do) + raise ValueError('Unsupported Key Ref Tag or Len in CRT DO %s' % do) if do[3:] != b'\x95\x01\x08': - raise ValueError( - 'Unsupported Usage Qualifier Tag or Len in CRT DO %s', do) + raise ValueError('Unsupported Usage Qualifier Tag or Len in CRT DO %s' % do) self.encoded = do[0:6] self.decoded = pin_names[do[2]] return do[6:] @@ -520,7 +518,7 @@ if inb & 0x10: res.append('user_auth') rd = {'mode': cond} - if len(res): + if len(res) > 0: rd['conditions'] = res self.decoded = rd @@ -723,7 +721,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) @@ -731,20 +729,17 @@ # '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) @with_default_category('File-Specific Commands') class AddlShellCommands(CommandSet): - def __init__(self): - super().__init__() - @cmd2.with_argparser(LinFixedEF.ShellCommands.read_rec_dec_parser) def do_read_arr_record(self, opts): """Read one EF.ARR record in flattened, human-friendly form.""" - (data, sw) = self._cmd.lchan.read_record_dec(opts.record_nr) + (data, _sw) = self._cmd.lchan.read_record_dec(opts.record_nr) data = self._cmd.lchan.selected_file.flatten(data) self._cmd.poutput_json(data, opts.oneline) @@ -755,7 +750,7 @@ # collect all results in list so they are rendered as JSON list when printing data_list = [] for recnr in range(1, 1 + num_of_rec): - (data, sw) = self._cmd.lchan.read_record_dec(recnr) + (data, _sw) = self._cmd.lchan.read_record_dec(recnr) data = self._cmd.lchan.selected_file.flatten(data) data_list.append(data) self._cmd.poutput_json(data_list, opts.oneline) @@ -869,10 +864,10 @@ shell_cmdsets = [self.AddlShellCommands()], addons = addons) @staticmethod - def decode_select_response(resp_hex: str) -> object: + def decode_select_response(data_hex: str) -> object: """ETSI TS 102 221 Section 11.1.1.3""" t = FcpTemplate() - t.from_tlv(h2b(resp_hex)) + t.from_tlv(h2b(data_hex)) d = t.to_dict() return flatten_dict_lists(d['fcp_template']) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35842?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I99d408bdf2551527f097a04240e857728b738621 Gerrit-Change-Number: 35842 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in pysim[master]: pylint: ara_m.py

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35843?usp=email ) Change subject: pylint: ara_m.py ...................................................................... pylint: ara_m.py pySim/ara_m.py:29:0: W0622: Redefining built-in 'BlockingIOError' (redefined-builtin) pySim/ara_m.py:29:0: W0401: Wildcard import construct (wildcard-import) pySim/ara_m.py:68:12: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/ara_m.py:89:12: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/ara_m.py:282:12: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/ara_m.py:280:15: W0612: Unused variable 'sw' (unused-variable) pySim/ara_m.py:312:34: W0613: Unused argument 'opts' (unused-argument) pySim/ara_m.py:318:37: W0613: Unused argument 'opts' (unused-argument) pySim/ara_m.py:356:15: C0121: Comparison 'opts.aid != None' should be 'opts.aid is not None' (singleton-comparison) pySim/ara_m.py:385:37: W0613: Unused argument 'opts' (unused-argument) pySim/ara_m.py:309:8: W0238: Unused private member `AddlShellCommands.__init(self)` (unused-private-member) pySim/ara_m.py:309:8: W0238: Unused private member `ADF_ARAM.AddlShellCommands.__init(self)` (unused-private-member) Change-Id: I5a739187a8966cdb0ae5c6cbc7bc5d4115433aeb --- M pySim/ara_m.py 1 file changed, 34 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ara_m.py b/pySim/ara_m.py index d137dcf..5776e3d 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -26,11 +26,12 @@ # -from construct import * +from construct import GreedyBytes, GreedyString, Struct, Enum, Int8ub, Int16ub from construct import Optional as COptional from pySim.construct import * from pySim.filesystem import * from pySim.tlv import * +from pySim.utils import Hexstr import pySim.global_platform # various BER-TLV encoded Data Objects (DOs) @@ -68,11 +69,10 @@ if do[0] == 0x00: self.decoded = {'generic_access_rule': 'never'} return self.decoded - elif do[0] == 0x01: + if do[0] == 0x01: self.decoded = {'generic_access_rule': 'always'} return self.decoded - else: - return ValueError('Invalid 1-byte generic APDU access rule') + return ValueError('Invalid 1-byte generic APDU access rule') else: if len(do) % 8: return ValueError('Invalid non-modulo-8 length of APDU filter: %d' % len(do)) @@ -88,10 +88,9 @@ if 'generic_access_rule' in self.decoded: if self.decoded['generic_access_rule'] == 'never': return b'\x00' - elif self.decoded['generic_access_rule'] == 'always': + if self.decoded['generic_access_rule'] == 'always': return b'\x01' - else: - return ValueError('Invalid 1-byte generic APDU access rule') + return ValueError('Invalid 1-byte generic APDU access rule') else: if not 'apdu_filter' in self.decoded: return ValueError('Invalid APDU AR DO') @@ -277,14 +276,13 @@ cmd_do_enc = b'' cmd_do_len = 0 c_apdu = hdr + ('%02x' % cmd_do_len) + b2h(cmd_do_enc) - (data, sw) = tp.send_apdu_checksw(c_apdu, exp_sw) + (data, _sw) = tp.send_apdu_checksw(c_apdu, exp_sw) if data: if resp_cls: resp_do = resp_cls() resp_do.from_tlv(h2b(data)) return resp_do - else: - return data + return data else: return None @@ -306,16 +304,13 @@ @with_default_category('Application-Specific Commands') class AddlShellCommands(CommandSet): - def __init(self): - super().__init__() - - def do_aram_get_all(self, opts): + def do_aram_get_all(self, _opts): """GET DATA [All] on the ARA-M Applet""" res_do = ADF_ARAM.get_all(self._cmd.lchan.scc._tp) if res_do: self._cmd.poutput_json(res_do.to_dict()) - def do_aram_get_config(self, opts): + def do_aram_get_config(self, _opts): """Perform GET DATA [Config] on the ARA-M Applet: Tell it our version and retrieve its version.""" res_do = ADF_ARAM.get_config(self._cmd.lchan.scc._tp) if res_do: @@ -353,7 +348,7 @@ """Perform STORE DATA [Command-Store-REF-AR-DO] to store a (new) access rule.""" # REF ref_do_content = [] - if opts.aid != None: + if opts.aid is not None: ref_do_content += [{'aid_ref_do': opts.aid}] elif opts.aid_empty: ref_do_content += [{'aid_ref_empty_do': None}] @@ -382,7 +377,7 @@ if res_do: self._cmd.poutput_json(res_do.to_dict()) - def do_aram_delete_all(self, opts): + def do_aram_delete_all(self, _opts): """Perform STORE DATA [Command-Delete[all]] to delete all access rules.""" deldo = CommandDelete() res_do = ADF_ARAM.store_data(self._cmd.lchan.scc._tp, deldo) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35843?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5a739187a8966cdb0ae5c6cbc7bc5d4115433aeb Gerrit-Change-Number: 35843 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in pysim[master]: pylint: runtime.py

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35844?usp=email ) Change subject: pylint: runtime.py ...................................................................... pylint: runtime.py pySim/runtime.py:272:0: C0325: Unnecessary parens after 'raise' keyword (superfluous-parens) pySim/runtime.py:276:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) pySim/runtime.py:280:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) pySim/runtime.py:349:0: C0325: Unnecessary parens after 'raise' keyword (superfluous-parens) pySim/runtime.py:549:0: C0305: Trailing newlines (trailing-newlines) pySim/runtime.py:29:4: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/runtime.py:119:16: W0612: Unused variable 'data' (unused-variable) pySim/runtime.py:153:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/runtime.py:161:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/runtime.py:212:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/runtime.py:273:12: W0707: Consider explicitly re-raising using 'raise RuntimeError('%s: %s - %s' % (swm.sw_actual, k[0], k[1])) from swm' (raise-missing-from) pySim/runtime.py:267:19: W0612: Unused variable 'sw' (unused-variable) pySim/runtime.py:343:27: W0612: Unused variable 'sw' (unused-variable) pySim/runtime.py:397:15: W0612: Unused variable 'sw' (unused-variable) pySim/runtime.py:527:14: W0612: Unused variable 'sw' (unused-variable) pySim/runtime.py:528:8: W0612: Unused variable 'tag' (unused-variable) pySim/runtime.py:528:13: W0612: Unused variable 'length' (unused-variable) pySim/runtime.py:528:28: W0612: Unused variable 'remainder' (unused-variable) Change-Id: I2e164dbaa2070116bed3bac63b0fa5b8aa5b1331 --- M pySim/runtime.py 1 file changed, 43 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/runtime.py b/pySim/runtime.py index 3aeaab1..d873e20 100644 --- a/pySim/runtime.py +++ b/pySim/runtime.py @@ -19,7 +19,7 @@ from typing import Optional, Tuple -from pySim.utils import sw_match, h2b, i2h, is_hex, bertlv_parse_one, Hexstr +from pySim.utils import h2b, i2h, is_hex, bertlv_parse_one, Hexstr from pySim.exceptions import * from pySim.filesystem import * @@ -29,11 +29,10 @@ if cla >> 4 in [0x0, 0xA, 0x8]: # Table 10.3 return cla & 0x03 - elif cla & 0xD0 in [0x40, 0xC0]: + if cla & 0xD0 in [0x40, 0xC0]: # Table 10.4a return 4 + (cla & 0x0F) - else: - raise ValueError('Could not determine logical channel for CLA=%2X' % cla) + raise ValueError('Could not determine logical channel for CLA=%2X' % cla) class RuntimeState: """Represent the runtime state of a session with a card.""" @@ -116,7 +115,7 @@ # no problem when we access the card object directly without caring # about updating other states. For normal selects at runtime, the # caller must use the lchan provided methods select or select_file! - data, sw = self.card.select_adf_by_aid(f.aid) + _data, sw = self.card.select_adf_by_aid(f.aid) self.selected_adf = f if sw == "9000": print(" %s: %s" % (f.name, f.aid)) @@ -264,20 +263,20 @@ # run time. In case the file does not exist on the card, we just abort. # The state on the card (selected file/application) wont't be changed, # so we do not have to update any state in that case. - (data, sw) = self.scc.select_file(fid) + (data, _sw) = self.scc.select_file(fid) except SwMatchError as swm: self._select_post(cmd_app) k = self.interpret_sw(swm.sw_actual) if not k: - raise(swm) - raise RuntimeError("%s: %s - %s" % (swm.sw_actual, k[0], k[1])) + raise swm + raise RuntimeError("%s: %s - %s" % (swm.sw_actual, k[0], k[1])) from swm select_resp = self.selected_file.decode_select_response(data) - if (select_resp['file_descriptor']['file_descriptor_byte']['file_type'] == 'df'): + if select_resp['file_descriptor']['file_descriptor_byte']['file_type'] == 'df': f = CardDF(fid=fid, sfid=None, name="DF." + str(fid).upper(), desc="dedicated file, manually added at runtime") else: - if (select_resp['file_descriptor']['file_descriptor_byte']['structure'] == 'transparent'): + if select_resp['file_descriptor']['file_descriptor_byte']['structure'] == 'transparent': f = TransparentEF(fid=fid, sfid=None, name="EF." + str(fid).upper(), desc="elementary file, manually added at runtime") else: @@ -340,13 +339,13 @@ # card directly since this would lead into an incoherence of the # card state and the state of the lchan. if isinstance(f, CardADF): - (data, sw) = self.rs.card.select_adf_by_aid(f.aid, scc=self.scc) + (data, _sw) = self.rs.card.select_adf_by_aid(f.aid, scc=self.scc) else: - (data, sw) = self.scc.select_file(f.fid) + (data, _sw) = self.scc.select_file(f.fid) selected_file = f except SwMatchError as swm: self._select_post(cmd_app, selected_file, data) - raise(swm) + raise swm self._select_post(cmd_app, f, data) @@ -394,7 +393,7 @@ def status(self): """Request STATUS (current selected file FCP) from card.""" - (data, sw) = self.scc.status() + (data, _sw) = self.scc.status() return self.selected_file.decode_select_response(data) def get_file_for_selectable(self, name: str): @@ -524,8 +523,8 @@ """ if not isinstance(self.selected_file, BerTlvEF): raise TypeError("Only works with BER-TLV EF") - data, sw = self.scc.retrieve_data(self.selected_file.fid, 0x5c) - tag, length, value, remainder = bertlv_parse_one(h2b(data)) + data, _sw = self.scc.retrieve_data(self.selected_file.fid, 0x5c) + _tag, _length, value, _remainder = bertlv_parse_one(h2b(data)) return list(value) def set_data(self, tag: int, data_hex: str): @@ -544,6 +543,3 @@ if cmd_app and self.selected_file.shell_commands: for c in self.selected_file.shell_commands: cmd_app.unregister_command_set(c) - - - -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35844?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2e164dbaa2070116bed3bac63b0fa5b8aa5b1331 Gerrit-Change-Number: 35844 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in pysim[master]: pylint: pySim/euicc.py

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35845?usp=email ) Change subject: pylint: pySim/euicc.py ...................................................................... pylint: pySim/euicc.py pySim/euicc.py:27:0: W0622: Redefining built-in 'BlockingIOError' (redefined-builtin) pySim/euicc.py:27:0: W0401: Wildcard import construct (wildcard-import) pySim/euicc.py:37:7: C0123: Use isinstance() rather than type() for a typecheck. (unidiomatic-typecheck) pySim/euicc.py:47:9: C0123: Use isinstance() rather than type() for a typecheck. (unidiomatic-typecheck) pySim/euicc.py:337:12: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/euicc.py:325:63: W0613: Unused argument 'exp_sw' (unused-argument) pySim/euicc.py:335:15: W0612: Unused variable 'sw' (unused-variable) pySim/euicc.py:361:13: W0612: Unused variable 'data' (unused-variable) pySim/euicc.py:361:19: W0612: Unused variable 'sw' (unused-variable) pySim/euicc.py:363:52: W0613: Unused argument 'opts' (unused-argument) pySim/euicc.py:380:41: W0613: Unused argument 'opts' (unused-argument) pySim/euicc.py:386:37: W0613: Unused argument 'opts' (unused-argument) pySim/euicc.py:392:37: W0613: Unused argument 'opts' (unused-argument) pySim/euicc.py:398:39: W0613: Unused argument 'opts' (unused-argument) pySim/euicc.py:415:39: W0613: Unused argument 'opts' (unused-argument) pySim/euicc.py:478:29: W0613: Unused argument 'opts' (unused-argument) pySim/euicc.py:480:13: W0612: Unused variable 'data' (unused-variable) pySim/euicc.py:480:19: W0612: Unused variable 'sw' (unused-variable) pySim/euicc.py:500:31: W0613: Unused argument 'opts' (unused-argument) pySim/euicc.py:506:48: W0613: Unused argument 'opts' (unused-argument) pySim/euicc.py:26:0: C0411: third party import "from construct import Optional as COptional" should be placed before "from pySim.tlv import *" (wrong-import-order) pySim/euicc.py:27:0: C0411: third party import "from construct import *" should be placed before "from pySim.tlv import *" (wrong-import-order) pySim/euicc.py:28:0: C0411: standard import "import argparse" should be placed before "from construct import Optional as COptional" (wrong-import-order) pySim/euicc.py:29:0: C0411: third party import "from cmd2 import cmd2, CommandSet, with_default_category" should be placed before "from pySim.tlv import *" (wrong-import-order) pySim/euicc.py:30:0: C0412: Imports from package pySim are not grouped (ungrouped-imports) pySim/euicc.py:31:0: W0611: Unused CardADF imported from pySim.filesystem (unused-import) pySim/euicc.py:31:0: W0611: Unused CardApplication imported from pySim.filesystem (unused-import) Change-Id: I6c33e2361a042a16f27e66cb883c392333b8383d --- M pySim/euicc.py 1 file changed, 60 insertions(+), 23 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/euicc.py b/pySim/euicc.py index 068fb72..8b8b973 100644 --- a/pySim/euicc.py +++ b/pySim/euicc.py @@ -21,20 +21,20 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +import argparse + +from construct import Array, Struct, FlagsEnum, GreedyRange +from cmd2 import cmd2, CommandSet, with_default_category + from pySim.tlv import * from pySim.construct import * -from construct import Optional as COptional -from construct import * -import argparse -from cmd2 import cmd2, CommandSet, with_default_category from pySim.commands import SimCardCommands -from pySim.filesystem import CardADF, CardApplication -from pySim.utils import Hexstr, SwHexstr +from pySim.utils import Hexstr, SwHexstr, SwMatchstr import pySim.global_platform def compute_eid_checksum(eid) -> str: """Compute and add/replace check digits of an EID value according to GSMA SGP.29 Section 10.""" - if type(eid) == str: + if isinstance(eid, str): if len(eid) == 30: # first pad by 2 digits eid += "00" @@ -44,7 +44,7 @@ else: raise ValueError("and EID must be 30 or 32 digits") eid_int = int(eid) - elif type(eid) == int: + elif isinstance(eid, int): eid_int = eid if eid_int % 100: # zero the last two digits @@ -315,14 +315,14 @@ self.adf.shell_commands += [self.AddlShellCommands()] @staticmethod - def store_data(scc: SimCardCommands, tx_do: Hexstr) -> Tuple[Hexstr, SwHexstr]: + def store_data(scc: SimCardCommands, tx_do: Hexstr, exp_sw: SwMatchstr ="9000") -> Tuple[Hexstr, SwHexstr]: """Perform STORE DATA according to Table 47+48 in Section 5.7.2 of SGP.22. Only single-block store supported for now.""" capdu = '%sE29100%02x%s' % (scc.cla4lchan('80'), len(tx_do)//2, tx_do) - return scc.send_apdu_checksw(capdu) + return scc.send_apdu_checksw(capdu, exp_sw) @staticmethod - def store_data_tlv(scc: SimCardCommands, cmd_do, resp_cls, exp_sw='9000'): + def store_data_tlv(scc: SimCardCommands, cmd_do, resp_cls, exp_sw: SwMatchstr = '9000'): """Transceive STORE DATA APDU with the card, transparently encoding the command data from TLV and decoding the response data tlv.""" if cmd_do: @@ -332,7 +332,7 @@ return ValueError('DO > 255 bytes not supported yet') else: cmd_do_enc = b'' - (data, sw) = CardApplicationISDR.store_data(scc, b2h(cmd_do_enc)) + (data, _sw) = CardApplicationISDR.store_data(scc, b2h(cmd_do_enc), exp_sw=exp_sw) if data: if resp_cls: resp_do = resp_cls() @@ -358,9 +358,9 @@ @cmd2.with_argparser(es10x_store_data_parser) def do_es10x_store_data(self, opts): """Perform a raw STORE DATA command as defined for the ES10x eUICC interface.""" - (data, sw) = CardApplicationISDR.store_data(self._cmd.lchan.scc, opts.TX_DO) + (_data, _sw) = CardApplicationISDR.store_data(self._cmd.lchan.scc, opts.TX_DO) - def do_get_euicc_configured_addresses(self, opts): + def do_get_euicc_configured_addresses(self, _opts): """Perform an ES10a GetEuiccConfiguredAddresses function.""" eca = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc, EuiccConfiguredAddresses(), EuiccConfiguredAddresses) d = eca.to_dict() @@ -377,25 +377,25 @@ d = sdda.to_dict() self._cmd.poutput_json(flatten_dict_lists(d['set_default_dp_address'])) - def do_get_euicc_challenge(self, opts): + def do_get_euicc_challenge(self, _opts): """Perform an ES10b GetEUICCChallenge function.""" gec = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc, GetEuiccChallenge(), GetEuiccChallenge) d = gec.to_dict() self._cmd.poutput_json(flatten_dict_lists(d['get_euicc_challenge'])) - def do_get_euicc_info1(self, opts): + def do_get_euicc_info1(self, _opts): """Perform an ES10b GetEUICCInfo (1) function.""" ei1 = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc, EuiccInfo1(), EuiccInfo1) d = ei1.to_dict() self._cmd.poutput_json(flatten_dict_lists(d['euicc_info1'])) - def do_get_euicc_info2(self, opts): + def do_get_euicc_info2(self, _opts): """Perform an ES10b GetEUICCInfo (2) function.""" ei2 = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc, EuiccInfo2(), EuiccInfo2) d = ei2.to_dict() self._cmd.poutput_json(flatten_dict_lists(d['euicc_info2'])) - def do_list_notification(self, opts): + def do_list_notification(self, _opts): """Perform an ES10b ListNotification function.""" ln = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc, ListNotificationReq(), ListNotificationResp) d = ln.to_dict() @@ -412,7 +412,7 @@ d = rn.to_dict() self._cmd.poutput_json(flatten_dict_lists(d['notification_sent_resp'])) - def do_get_profiles_info(self, opts): + def do_get_profiles_info(self, _opts): """Perform an ES10c GetProfilesInfo function.""" pi = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc, ProfileInfoListReq(), ProfileInfoListResp) d = pi.to_dict() @@ -475,9 +475,9 @@ self._cmd.poutput_json(flatten_dict_lists(d['delete_profile_resp'])) - def do_get_eid(self, opts): + def do_get_eid(self, _opts): """Perform an ES10c GetEID function.""" - (data, sw) = CardApplicationISDR.store_data(self._cmd.lchan.scc, 'BF3E035C015A') + (_data, _sw) = CardApplicationISDR.store_data(self._cmd.lchan.scc, 'BF3E035C015A') ged_cmd = GetEuiccData(children=[TagList(decoded=[0x5A])]) ged = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc, ged_cmd, GetEuiccData) d = ged.to_dict() @@ -497,13 +497,13 @@ d = sn.to_dict() self._cmd.poutput_json(flatten_dict_lists(d['set_nickname_resp'])) - def do_get_certs(self, opts): + def do_get_certs(self, _opts): """Perform an ES10c GetCerts() function on an IoT eUICC.""" gc = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc, GetCertsReq(), GetCertsResp) d = gc.to_dict() self._cmd.poutput_json(flatten_dict_lists(d['get_certficiates_resp'])) - def do_get_eim_configuration_data(self, opts): + def do_get_eim_configuration_data(self, _opts): """Perform an ES10b GetEimConfigurationData function on an Iot eUICC.""" gec = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc, GetEimConfigurationData(), GetEimConfigurationData) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35845?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6c33e2361a042a16f27e66cb883c392333b8383d Gerrit-Change-Number: 35845 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in pysim[master]: pylint: commands.py

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35846?usp=email ) Change subject: pylint: commands.py ...................................................................... pylint: commands.py pySim/commands.py:443:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) pySim/commands.py:446:0: C0325: Unnecessary parens after 'elif' keyword (superfluous-parens) pySim/commands.py:669:0: C0325: Unnecessary parens after 'elif' keyword (superfluous-parens) pySim/commands.py:27:0: W0622: Redefining built-in 'BlockingIOError' (redefined-builtin) pySim/commands.py:27:0: W0401: Wildcard import construct (wildcard-import) pySim/commands.py:30:0: W0404: Reimport 'Hexstr' (imported line 29) (reimported) pySim/commands.py:42:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/commands.py:48:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/commands.py:98:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/commands.py:114:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/commands.py:131:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/commands.py:223:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/commands.py:234:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/commands.py:252:11: C0123: Use isinstance() rather than type() for a typecheck. (unidiomatic-typecheck) pySim/commands.py:271:11: C0123: Use isinstance() rather than type() for a typecheck. (unidiomatic-typecheck) pySim/commands.py:274:18: W0612: Unused variable 'sw' (unused-variable) pySim/commands.py:326:16: W0707: Consider explicitly re-raising using 'raise ValueError('%s, failed to read (offset %d)' % (str_sanitize(str(e)), offset)) from e' (raise-missing-from) pySim/commands.py:386:16: W0707: Consider explicitly re-raising using 'raise ValueError('%s, failed to write chunk (chunk_offset %d, chunk_len %d)' % (str_sanitize(str(e)), chunk_offset, chunk_len)) from e' (raise-missing-from) pySim/commands.py:443:12: R1720: Unnecessary "elif" after "raise", remove the leading "el" from "elif" (no-else-raise) pySim/commands.py:521:14: R1714: Consider merging these comparisons with 'in' by using 'sw in ('62f1', '62f2')'. Use a set instead if elements are hashable. (consider-using-in) pySim/commands.py:532:11: R1701: Consider merging these isinstance calls to isinstance(data, (bytearray, bytes)) (consider-merging-isinstance) pySim/commands.py:666:8: R1720: Unnecessary "elif" after "raise", remove the leading "el" from "elif" (no-else-raise) pySim/commands.py:762:12: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/commands.py:776:12: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) Change-Id: Idfcd6f799d5de9ecacd2c3d1e0d1f7d932f2b8db --- M pySim/commands.py 1 file changed, 59 insertions(+), 27 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/commands.py b/pySim/commands.py index 81edf82..4e439e6 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -21,12 +21,13 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from typing import List, Optional, Tuple +from typing import List, Tuple import typing # construct also has a Union, so we do typing.Union below -from construct import * +from construct import Construct, Struct, Const, Select +from construct import Optional as COptional from pySim.construct import LV, filter_dict -from pySim.utils import rpad, lpad, b2h, h2b, sw_match, bertlv_encode_len, Hexstr, h2i, i2h, str_sanitize, expand_hex, SwMatchstr +from pySim.utils import rpad, lpad, b2h, h2b, sw_match, bertlv_encode_len, h2i, i2h, str_sanitize, expand_hex, SwMatchstr from pySim.utils import Hexstr, SwHexstr, ResTuple from pySim.exceptions import SwMatchError from pySim.transport import LinkBase @@ -249,7 +250,7 @@ """ rv = [] - if type(dir_list) is not list: + if not isinstance(dir_list, list): dir_list = [dir_list] for i in dir_list: data, sw = self.send_apdu(self.cla_byte + "a4" + self.sel_ctrl + "02" + i) @@ -268,10 +269,10 @@ list of return values (FCP in hex encoding) for each element of the path """ rv = [] - if type(dir_list) is not list: + if not isinstance(dir_list, list): dir_list = [dir_list] for i in dir_list: - data, sw = self.select_file(i) + data, _sw = self.select_file(i) rv.append(data) return rv @@ -324,7 +325,7 @@ data, sw = self.send_apdu_checksw(pdu) except Exception as e: raise ValueError('%s, failed to read (offset %d)' % - (str_sanitize(str(e)), offset)) + (str_sanitize(str(e)), offset)) from e total_data += data chunk_offset += chunk_len return total_data, sw @@ -384,7 +385,7 @@ chunk_data, chunk_sw = self.send_apdu_checksw(pdu) except Exception as e: raise ValueError('%s, failed to write chunk (chunk_offset %d, chunk_len %d)' % - (str_sanitize(str(e)), chunk_offset, chunk_len)) + (str_sanitize(str(e)), chunk_offset, chunk_len)) from e total_data += data chunk_offset += chunk_len if verify: @@ -440,10 +441,10 @@ else: # make sure the input data is padded to the record length using 0xFF. # In cases where the input data exceed we throw an exception. - if (len(data) // 2 > rec_length): + if len(data) // 2 > rec_length: raise ValueError('Data length exceeds record length (expected max %d, got %d)' % ( rec_length, len(data) // 2)) - elif (len(data) // 2 < rec_length): + elif len(data) // 2 < rec_length: if leftpad: data = lpad(data, rec_length * 2) else: @@ -518,7 +519,7 @@ # retrieve first block data, sw = self._retrieve_data(tag, first=True) total_data += data - while sw == '62f1' or sw == '62f2': + while sw in ['62f1', '62f2']: data, sw = self._retrieve_data(tag, first=False) total_data += data return total_data, sw @@ -529,7 +530,7 @@ p1 = 0x80 else: p1 = 0x00 - if isinstance(data, bytes) or isinstance(data, bytearray): + if isinstance(data, (bytes, bytearray)): data = b2h(data) pdu = self.cla4lchan('80') + 'db00%02x%02x%s' % (p1, len(data)//2, data) return self.send_apdu_checksw(pdu) @@ -585,10 +586,9 @@ context : 16 byte random data ('3g' or 'gsm') """ # 3GPP TS 31.102 Section 7.1.2.1 - AuthCmd3G = Struct('rand'/LV, 'autn'/Optional(LV)) + AuthCmd3G = Struct('rand'/LV, 'autn'/COptional(LV)) AuthResp3GSyncFail = Struct(Const(b'\xDC'), 'auts'/LV) - AuthResp3GSuccess = Struct( - Const(b'\xDB'), 'res'/LV, 'ck'/LV, 'ik'/LV, 'kc'/Optional(LV)) + AuthResp3GSuccess = Struct(Const(b'\xDB'), 'res'/LV, 'ck'/LV, 'ik'/LV, 'kc'/COptional(LV)) AuthResp3G = Select(AuthResp3GSyncFail, AuthResp3GSuccess) # build parameters cmd_data = {'rand': rand, 'autn': autn} @@ -666,7 +666,7 @@ if sw_match(sw, '63cx'): raise RuntimeError('Failed to %s chv_no 0x%02X with code 0x%s, %i tries left.' % (op_name, chv_no, b2h(pin_code).upper(), int(sw[3]))) - elif (sw != '9000'): + if sw != '9000': raise SwMatchError(sw, '9000') def verify_chv(self, chv_no: int, code: Hexstr) -> ResTuple: @@ -761,30 +761,28 @@ def encode_duration(secs: int) -> Hexstr: if secs >= 10*24*60*60: return '04%02x' % (secs // (10*24*60*60)) - elif secs >= 24*60*60: + if secs >= 24*60*60: return '03%02x' % (secs // (24*60*60)) - elif secs >= 60*60: + if secs >= 60*60: return '02%02x' % (secs // (60*60)) - elif secs >= 60: + if secs >= 60: return '01%02x' % (secs // 60) - else: - return '00%02x' % secs + return '00%02x' % secs def decode_duration(enc: Hexstr) -> int: time_unit = enc[:2] length = h2i(enc[2:4])[0] if time_unit == '04': return length * 10*24*60*60 - elif time_unit == '03': + if time_unit == '03': return length * 24*60*60 - elif time_unit == '02': + if time_unit == '02': return length * 60*60 - elif time_unit == '01': + if time_unit == '01': return length * 60 - elif time_unit == '00': + if time_unit == '00': return length - else: - raise ValueError('Time unit must be 0x00..0x04') + raise ValueError('Time unit must be 0x00..0x04') min_dur_enc = encode_duration(min_len_secs) max_dur_enc = encode_duration(max_len_secs) data, sw = self.send_apdu_checksw('8076000004' + min_dur_enc + max_dur_enc) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35846?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Idfcd6f799d5de9ecacd2c3d1e0d1f7d932f2b8db Gerrit-Change-Number: 35846 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in pysim[master]: pylint: filesystem.py

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35847?usp=email ) Change subject: pylint: filesystem.py ...................................................................... pylint: filesystem.py pySim/filesystem.py:823:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) pySim/filesystem.py:849:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) pySim/filesystem.py:43:0: W0401: Wildcard import pySim.exceptions (wildcard-import) pySim/filesystem.py:74:45: C0121: Comparison 'fid == None' should be 'fid is None' (singleton-comparison) pySim/filesystem.py:94:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/filesystem.py:100:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/filesystem.py:149:8: W0105: String statement has no effect (pointless-string-statement) pySim/filesystem.py:170:11: C0121: Comparison 'self.parent == None' should be 'self.parent is None' (singleton-comparison) pySim/filesystem.py:283:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/filesystem.py:309:8: W0246: Useless parent or super() delegation in method '__init__' (useless-parent-delegation) pySim/filesystem.py:314:15: C0117: Consider changing "not 'fid' in kwargs" to "'fid' not in kwargs" (unnecessary-negation) pySim/filesystem.py:317:24: R1735: Consider using '{}' instead of a call to 'dict'. (use-dict-literal) pySim/filesystem.py:418:11: C0121: Comparison 'name == None' should be 'name is None' (singleton-comparison) pySim/filesystem.py:427:11: C0121: Comparison 'sfid == None' should be 'sfid is None' (singleton-comparison) pySim/filesystem.py:452:28: R1735: Consider using '{}' instead of a call to 'dict'. (use-dict-literal) pySim/filesystem.py:508:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/filesystem.py:531:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return) pySim/filesystem.py:576:8: W0246: Useless parent or super() delegation in method '__init__' (useless-parent-delegation) pySim/filesystem.py:599:19: W0612: Unused variable 'sw' (unused-variable) pySim/filesystem.py:609:19: W0612: Unused variable 'sw' (unused-variable) pySim/filesystem.py:620:19: W0612: Unused variable 'sw' (unused-variable) pySim/filesystem.py:633:28: W0612: Unused variable 'sw' (unused-variable) pySim/filesystem.py:642:41: W0613: Unused argument 'opts' (unused-argument) pySim/filesystem.py:644:24: W0612: Unused variable 'sw' (unused-variable) pySim/filesystem.py:696:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/filesystem.py:723:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/filesystem.py:749:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/filesystem.py:777:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/filesystem.py:797:8: W0246: Useless parent or super() delegation in method '__init__' (useless-parent-delegation) pySim/filesystem.py:822:23: W0612: Unused variable 'sw' (unused-variable) pySim/filesystem.py:838:19: W0612: Unused variable 'sw' (unused-variable) pySim/filesystem.py:844:34: W0613: Unused argument 'opts' (unused-argument) pySim/filesystem.py:848:23: W0612: Unused variable 'sw' (unused-variable) pySim/filesystem.py:866:23: W0612: Unused variable 'sw' (unused-variable) pySim/filesystem.py:878:19: W0612: Unused variable 'sw' (unused-variable) pySim/filesystem.py:893:28: W0612: Unused variable 'sw' (unused-variable) pySim/filesystem.py:910:24: W0612: Unused variable 'sw' (unused-variable) pySim/filesystem.py:967:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/filesystem.py:995:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/filesystem.py:1023:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/filesystem.py:1051:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/filesystem.py:1114:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/filesystem.py:1141:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/filesystem.py:1167:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/filesystem.py:1194:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/filesystem.py:1226:8: W0246: Useless parent or super() delegation in method '__init__' (useless-parent-delegation) pySim/filesystem.py:1236:19: W0612: Unused variable 'sw' (unused-variable) pySim/filesystem.py:1239:35: W0613: Unused argument 'opts' (unused-argument) pySim/filesystem.py:1252:19: W0612: Unused variable 'sw' (unused-variable) pySim/filesystem.py:1263:19: W0612: Unused variable 'sw' (unused-variable) pySim/filesystem.py:1315:24: R1735: Consider using '{}' instead of a call to 'dict'. (use-dict-literal) pySim/filesystem.py:35:0: C0411: standard import "import argparse" should be placed before "import cmd2" (wrong-import-order) pySim/filesystem.py:37:0: C0411: standard import "from typing import cast, Optional, Iterable, List, Dict, Tuple, Union" should be placed before "import cmd2" (wrong-import-order) pySim/filesystem.py:27:0: W0611: Unused import code (unused-import) pySim/filesystem.py:34:0: W0611: Unused with_argparser imported from cmd2 (unused-import) pySim/filesystem.py:41:0: W0611: Unused i2h imported from pySim.utils (unused-import) pySim/filesystem.py:41:0: W0611: Unused Hexstr imported from pySim.utils (unused-import) pySim/filesystem.py:44:0: W0611: Unused js_path_find imported from pySim.jsonpath (unused-import) pySim/filesystem.py:43:0: W0614: Unused import(s) NoCardError, ProtocolError, ReaderError and SwMatchError from wildcard import of pySim.exceptions (unused-wildcard-import) Change-Id: I94e1f5791e9fc34a60d0254978a35fd6ab2ff8d7 --- M pySim/apdu/ts_102_221.py M pySim/filesystem.py 2 files changed, 125 insertions(+), 71 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/apdu/ts_102_221.py b/pySim/apdu/ts_102_221.py index 6e14b8a..52d88d2 100644 --- a/pySim/apdu/ts_102_221.py +++ b/pySim/apdu/ts_102_221.py @@ -26,6 +26,7 @@ from pySim.filesystem import * from pySim.runtime import RuntimeLchan from pySim.apdu import ApduCommand, ApduCommandSet +from pySim.utils import i2h logger = logging.getLogger(__name__) diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 47bdb57..4d5fde9 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -24,24 +24,20 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -import code +from typing import cast, Optional, Iterable, List, Dict, Tuple, Union +import argparse import tempfile import json import abc import inspect import cmd2 -from cmd2 import CommandSet, with_default_category, with_argparser -import argparse - -from typing import cast, Optional, Iterable, List, Dict, Tuple, Union - +from cmd2 import CommandSet, with_default_category from smartcard.util import toBytes -from pySim.utils import sw_match, h2b, b2h, i2h, is_hex, auto_int, auto_uint8, auto_uint16, Hexstr, is_hexstr +from pySim.utils import sw_match, h2b, b2h, is_hex, auto_int, auto_uint8, auto_uint16, is_hexstr from pySim.construct import filter_dict, parse_construct, build_construct -from pySim.exceptions import * -from pySim.jsonpath import js_path_find, js_path_modify +from pySim.jsonpath import js_path_modify from pySim.commands import SimCardCommands # int: a single service is associated with this file @@ -71,7 +67,7 @@ profile : Card profile that this file should be part of service : Service (SST/UST/IST) associated with the file """ - if not isinstance(self, CardADF) and fid == None: + if not isinstance(self, CardADF) and fid is None: raise ValueError("fid is mandatory") if fid: fid = fid.lower() @@ -136,6 +132,7 @@ return ret def build_select_path_to(self, target: 'CardFile') -> Optional[List['CardFile']]: + """Build the relative sequence of files we need to traverse to get from us to 'target'.""" # special-case handling for applications. Applications may be selected # any time from any location. If there is an ADF somewhere in the path, @@ -146,7 +143,6 @@ return inter_path[i:] return inter_path - """Build the relative sequence of files we need to traverse to get from us to 'target'.""" # special-case handling for selecting MF while the MF is selected if target == target.get_mf(): return [target] @@ -167,7 +163,7 @@ def get_mf(self) -> Optional['CardMF']: """Return the MF (root) of the file system.""" - if self.parent == None: + if self.parent is None: return None # iterate towards the top. MF has parent == self node = self @@ -282,23 +278,22 @@ """Assuming the provided list of activated services, should this file exist and be activated?.""" if self.service is None: return None - elif isinstance(self.service, int): + if isinstance(self.service, int): # a single service determines the result return self.service in services - elif isinstance(self.service, list): + if isinstance(self.service, list): # any of the services active -> true for s in self.service: if s in services: return True return False - elif isinstance(self.service, tuple): + if isinstance(self.service, tuple): # all of the services active -> true for s in self.service: if not s in services: return False return True - else: - raise ValueError("self.service must be either int or list or tuple") + raise ValueError("self.service must be either int or list or tuple") class CardDF(CardFile): @@ -306,15 +301,14 @@ @with_default_category('DF/ADF Commands') class ShellCommands(CommandSet): - def __init__(self): - super().__init__() + pass def __init__(self, **kwargs): if not isinstance(self, CardADF): - if not 'fid' in kwargs: + if 'fid' not in kwargs: raise TypeError('fid is mandatory for all DF') super().__init__(**kwargs) - self.children = dict() + self.children = {} self.shell_commands = [self.ShellCommands()] # dict of CardFile affected by service(int), indexed by service self.files_by_service = {} @@ -415,7 +409,7 @@ def lookup_file_by_name(self, name: Optional[str]) -> Optional[CardFile]: """Find a file with given name within current DF.""" - if name == None: + if name is None: return None for i in self.children.values(): if i.name and i.name == name: @@ -424,7 +418,7 @@ def lookup_file_by_sfid(self, sfid: Optional[str]) -> Optional[CardFile]: """Find a file with given short file ID within current DF.""" - if sfid == None: + if sfid is None: return None for i in self.children.values(): if i.sfid == int(str(sfid)): @@ -449,7 +443,7 @@ # cannot be overridden; use assignment kwargs['parent'] = self super().__init__(**kwargs) - self.applications = dict() + self.applications = {} def __str__(self): return "MF(%s)" % (self.fid) @@ -573,9 +567,6 @@ class ShellCommands(CommandSet): """Shell commands specific for transparent EFs.""" - def __init__(self): - super().__init__() - dec_hex_parser = argparse.ArgumentParser() dec_hex_parser.add_argument('--oneline', action='store_true', help='No JSON pretty-printing, dump as a single line') @@ -596,7 +587,7 @@ @cmd2.with_argparser(read_bin_parser) def do_read_binary(self, opts): """Read binary data from a transparent EF""" - (data, sw) = self._cmd.lchan.read_binary(opts.length, opts.offset) + (data, _sw) = self._cmd.lchan.read_binary(opts.length, opts.offset) self._cmd.poutput(data) read_bin_dec_parser = argparse.ArgumentParser() @@ -606,7 +597,7 @@ @cmd2.with_argparser(read_bin_dec_parser) def do_read_binary_decoded(self, opts): """Read + decode data from a transparent EF""" - (data, sw) = self._cmd.lchan.read_binary_dec() + (data, _sw) = self._cmd.lchan.read_binary_dec() self._cmd.poutput_json(data, opts.oneline) upd_bin_parser = argparse.ArgumentParser() @@ -617,7 +608,7 @@ @cmd2.with_argparser(upd_bin_parser) def do_update_binary(self, opts): """Update (Write) data of a transparent EF""" - (data, sw) = self._cmd.lchan.update_binary(opts.data, opts.offset) + (data, _sw) = self._cmd.lchan.update_binary(opts.data, opts.offset) if data: self._cmd.poutput(data) @@ -630,18 +621,18 @@ def do_update_binary_decoded(self, opts): """Encode + Update (Write) data of a transparent EF""" if opts.json_path: - (data_json, sw) = self._cmd.lchan.read_binary_dec() + (data_json, _sw) = self._cmd.lchan.read_binary_dec() js_path_modify(data_json, opts.json_path, json.loads(opts.data)) else: data_json = json.loads(opts.data) - (data, sw) = self._cmd.lchan.update_binary_dec(data_json) + (data, _sw) = self._cmd.lchan.update_binary_dec(data_json) if data: self._cmd.poutput_json(data) - def do_edit_binary_decoded(self, opts): + def do_edit_binary_decoded(self, _opts): """Edit the JSON representation of the EF contents in an editor.""" - (orig_json, sw) = self._cmd.lchan.read_binary_dec() + (orig_json, _sw) = self._cmd.lchan.read_binary_dec() with tempfile.TemporaryDirectory(prefix='pysim_') as dirname: filename = '%s/file' % dirname # write existing data as JSON to file @@ -654,7 +645,7 @@ if edited_json == orig_json: self._cmd.poutput("Data not modified, skipping write") else: - (data, sw) = self._cmd.lchan.update_binary_dec(edited_json) + (data, _sw) = self._cmd.lchan.update_binary_dec(edited_json) if data: self._cmd.poutput_json(data) @@ -695,7 +686,7 @@ return method(b2h(raw_bin_data)) if self._construct: return parse_construct(self._construct, raw_bin_data) - elif self._tlv: + if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() @@ -722,7 +713,7 @@ return method(raw_bin_data) if self._construct: return parse_construct(self._construct, raw_bin_data) - elif self._tlv: + if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() @@ -748,7 +739,7 @@ return h2b(method(abstract_data)) if self._construct: return build_construct(self._construct, abstract_data) - elif self._tlv: + if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return t.to_tlv() @@ -776,7 +767,7 @@ return b2h(raw_bin_data) if self._construct: return b2h(build_construct(self._construct, abstract_data)) - elif self._tlv: + if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return b2h(t.to_tlv()) @@ -793,10 +784,6 @@ @with_default_category('Linear Fixed EF Commands') class ShellCommands(CommandSet): """Shell commands specific for Linear Fixed EFs.""" - - def __init__(self, **kwargs): - super().__init__(**kwargs) - dec_hex_parser = argparse.ArgumentParser() dec_hex_parser.add_argument('--oneline', action='store_true', help='No JSON pretty-printing, dump as a single line') @@ -819,8 +806,8 @@ """Read one or multiple records from a record-oriented EF""" for r in range(opts.count): recnr = opts.record_nr + r - (data, sw) = self._cmd.lchan.read_record(recnr) - if (len(data) > 0): + (data, _sw) = self._cmd.lchan.read_record(recnr) + if len(data) > 0: recstr = str(data) else: recstr = "(empty)" @@ -835,18 +822,18 @@ @cmd2.with_argparser(read_rec_dec_parser) def do_read_record_decoded(self, opts): """Read + decode a record from a record-oriented EF""" - (data, sw) = self._cmd.lchan.read_record_dec(opts.record_nr) + (data, _sw) = self._cmd.lchan.read_record_dec(opts.record_nr) self._cmd.poutput_json(data, opts.oneline) read_recs_parser = argparse.ArgumentParser() @cmd2.with_argparser(read_recs_parser) - def do_read_records(self, opts): + def do_read_records(self, _opts): """Read all records from a record-oriented EF""" num_of_rec = self._cmd.lchan.selected_file_num_of_rec() for recnr in range(1, 1 + num_of_rec): - (data, sw) = self._cmd.lchan.read_record(recnr) - if (len(data) > 0): + (data, _sw) = self._cmd.lchan.read_record(recnr) + if len(data) > 0: recstr = str(data) else: recstr = "(empty)" @@ -863,7 +850,7 @@ # collect all results in list so they are rendered as JSON list when printing data_list = [] for recnr in range(1, 1 + num_of_rec): - (data, sw) = self._cmd.lchan.read_record_dec(recnr) + (data, _sw) = self._cmd.lchan.read_record_dec(recnr) data_list.append(data) self._cmd.poutput_json(data_list, opts.oneline) @@ -875,7 +862,7 @@ @cmd2.with_argparser(upd_rec_parser) def do_update_record(self, opts): """Update (write) data to a record-oriented EF""" - (data, sw) = self._cmd.lchan.update_record(opts.record_nr, opts.data) + (data, _sw) = self._cmd.lchan.update_record(opts.record_nr, opts.data) if data: self._cmd.poutput(data) @@ -890,12 +877,12 @@ def do_update_record_decoded(self, opts): """Encode + Update (write) data to a record-oriented EF""" if opts.json_path: - (data_json, sw) = self._cmd.lchan.read_record_dec(opts.record_nr) + (data_json, _sw) = self._cmd.lchan.read_record_dec(opts.record_nr) js_path_modify(data_json, opts.json_path, json.loads(opts.data)) else: data_json = json.loads(opts.data) - (data, sw) = self._cmd.lchan.update_record_dec( + (data, _sw) = self._cmd.lchan.update_record_dec( opts.record_nr, data_json) if data: self._cmd.poutput(data) @@ -907,7 +894,7 @@ @cmd2.with_argparser(edit_rec_dec_parser) def do_edit_record_decoded(self, opts): """Edit the JSON representation of one record in an editor.""" - (orig_json, sw) = self._cmd.lchan.read_record_dec(opts.record_nr) + (orig_json, _sw) = self._cmd.lchan.read_record_dec(opts.record_nr) with tempfile.TemporaryDirectory(prefix='pysim_') as dirname: filename = '%s/file' % dirname # write existing data as JSON to file @@ -920,7 +907,7 @@ if edited_json == orig_json: self._cmd.poutput("Data not modified, skipping write") else: - (data, sw) = self._cmd.lchan.update_record_dec( + (data, _sw) = self._cmd.lchan.update_record_dec( opts.record_nr, edited_json) if data: self._cmd.poutput_json(data) @@ -966,7 +953,7 @@ return method(raw_bin_data, record_nr=record_nr) if self._construct: return parse_construct(self._construct, raw_bin_data) - elif self._tlv: + if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() @@ -994,7 +981,7 @@ return method(raw_hex_data, record_nr=record_nr) if self._construct: return parse_construct(self._construct, raw_bin_data) - elif self._tlv: + if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() @@ -1022,7 +1009,7 @@ return b2h(raw_bin_data) if self._construct: return b2h(build_construct(self._construct, abstract_data)) - elif self._tlv: + if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return b2h(t.to_tlv()) @@ -1050,7 +1037,7 @@ return h2b(method(abstract_data, record_nr=record_nr)) if self._construct: return build_construct(self._construct, abstract_data) - elif self._tlv: + if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return t.to_tlv() @@ -1113,7 +1100,7 @@ return method(raw_bin_data) if self._construct: return parse_construct(self._construct, raw_bin_data) - elif self._tlv: + if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() @@ -1140,7 +1127,7 @@ return method(raw_hex_data) if self._construct: return parse_construct(self._construct, raw_bin_data) - elif self._tlv: + if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() @@ -1166,7 +1153,7 @@ return b2h(method(abstract_data)) if self._construct: return b2h(filter_dict(build_construct(self._construct, abstract_data))) - elif self._tlv: + if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return b2h(t.to_tlv()) @@ -1193,7 +1180,7 @@ return h2b(method(abstract_data)) if self._construct: return filter_dict(build_construct(self._construct, abstract_data)) - elif self._tlv: + if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return t.to_tlv() @@ -1223,9 +1210,6 @@ class ShellCommands(CommandSet): """Shell commands specific for BER-TLV EFs.""" - def __init__(self): - super().__init__() - retrieve_data_parser = argparse.ArgumentParser() retrieve_data_parser.add_argument( 'tag', type=auto_int, help='BER-TLV Tag of value to retrieve') @@ -1233,10 +1217,10 @@ @cmd2.with_argparser(retrieve_data_parser) def do_retrieve_data(self, opts): """Retrieve (Read) data from a BER-TLV EF""" - (data, sw) = self._cmd.lchan.retrieve_data(opts.tag) + (data, _sw) = self._cmd.lchan.retrieve_data(opts.tag) self._cmd.poutput(data) - def do_retrieve_tags(self, opts): + def do_retrieve_tags(self, _opts): """List tags available in a given BER-TLV EF""" tags = self._cmd.lchan.retrieve_tags() self._cmd.poutput(tags) @@ -1249,7 +1233,7 @@ @cmd2.with_argparser(set_data_parser) def do_set_data(self, opts): """Set (Write) data for a given tag in a BER-TLV EF""" - (data, sw) = self._cmd.lchan.set_data(opts.tag, opts.data) + (data, _sw) = self._cmd.lchan.set_data(opts.tag, opts.data) if data: self._cmd.poutput(data) @@ -1260,7 +1244,7 @@ @cmd2.with_argparser(del_data_parser) def do_delete_data(self, opts): """Delete data for a given tag in a BER-TLV EF""" - (data, sw) = self._cmd.lchan.set_data(opts.tag, None) + (data, _sw) = self._cmd.lchan.set_data(opts.tag, None) if data: self._cmd.poutput(data) @@ -1312,7 +1296,7 @@ """ self.name = name self.adf = adf - self.sw = sw or dict() + self.sw = sw or {} # back-reference from ADF to Applicaiton if self.adf: self.aid = aid or self.adf.aid -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35847?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I94e1f5791e9fc34a60d0254978a35fd6ab2ff8d7 Gerrit-Change-Number: 35847 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in pysim[master]: pylint: filesystem.py

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35847?usp=email ) Change subject: pylint: filesystem.py ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35847?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I94e1f5791e9fc34a60d0254978a35fd6ab2ff8d7 Gerrit-Change-Number: 35847 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 05 Feb 2024 17:08:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024