- gerrit-log - lists.osmocom.org

[S] Change in osmocom-bb[master]: mobile: use tch_send_msg() in tch_csd_tx_to_l1()
by pespin 05 Feb '24

05 Feb '24

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35862?usp=email ) Change subject: mobile: use tch_send_msg() in tch_csd_tx_to_l1() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35862?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icd5b5fad835feecd96a83fa5c83ed08037826fa6 Gerrit-Change-Number: 35862 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 Feb 2024 18:07:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: mobile: init TCH state earlier (on receipt of CC ALERTING)
by Jenkins Builder 05 Feb '24

05 Feb '24

Attention is currently required from: jolly, pespin. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email ) Change subject: mobile: init TCH state earlier (on receipt of CC ALERTING) ...................................................................... Patch Set 2: (1 comment) File src/host/layer23/src/mobile/tch.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-14222): https://gerrit.osmocom.org/c/osmocom-bb/+/35739/comment/600ec3bf_a84d7ae4 PS2, Line 62: } else { else is not generally useful after a break or return -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idd32c823639cc1f9999d77fcefe7e260e31a85ec Gerrit-Change-Number: 35739 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 Feb 2024 18:06:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: mobile: init TCH state earlier (on receipt of CC ALERTING)
by fixeria 05 Feb '24

05 Feb '24

Attention is currently required from: jolly, pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: mobile: init TCH state earlier (on receipt of CC ALERTING) ...................................................................... mobile: init TCH state earlier (on receipt of CC ALERTING) During a Mobile Originating voice call, we would normally start receiving traffic indications with ringback tone (or even some melody) before the call gets CONNECTed. So in order for the user to be able to hear that, we need to init the voice call handler earlier (on receipt of CC ALERTING message). We should not be transmitting voice/data frames before the call gets CONNECTed, so add 'rx_only' flag to the TCH state. In tch_send_msg() drop msgb if this flag is set. Rx only mode makes no sense for data calls, so in tch_recv_cb() we discard received DL frames and thus do not trigger sending UL frames. Change-Id: Idd32c823639cc1f9999d77fcefe7e260e31a85ec Related: OS#4396 --- M src/host/layer23/include/osmocom/bb/mobile/tch.h M src/host/layer23/src/mobile/tch.c 2 files changed, 52 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/39/35739/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idd32c823639cc1f9999d77fcefe7e260e31a85ec Gerrit-Change-Number: 35739 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmocom-bb[master]: mobile: disable TCH/F14.4 (not implemented)
by fixeria 05 Feb '24

05 Feb '24

Attention is currently required from: fixeria. Hello Jenkins Builder, jolly, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/35738?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: mobile: disable TCH/F14.4 (not implemented) ...................................................................... mobile: disable TCH/F14.4 (not implemented) Change-Id: Ia8dff81d4b56c9d6599059f3a5a2964d3cd95829 Related: OS#4396, OS#6346 --- M doc/examples/mobile/default.cfg M src/host/layer23/src/common/support.c 2 files changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/38/35738/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35738?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia8dff81d4b56c9d6599059f3a5a2964d3cd95829 Gerrit-Change-Number: 35738 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmocom-bb[master]: mobile: use tch_send_msg() in tch_csd_tx_to_l1()
by fixeria 05 Feb '24

05 Feb '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35862?usp=email ) Change subject: mobile: use tch_send_msg() in tch_csd_tx_to_l1() ...................................................................... mobile: use tch_send_msg() in tch_csd_tx_to_l1() Do not access the RR API directly, use TCH API for sending UL data. Change-Id: Icd5b5fad835feecd96a83fa5c83ed08037826fa6 Related: OS#4396 --- M src/host/layer23/src/mobile/tch_data.c 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/62/35862/1 diff --git a/src/host/layer23/src/mobile/tch_data.c b/src/host/layer23/src/mobile/tch_data.c index 5474bdf..7f0a330 100644 --- a/src/host/layer23/src/mobile/tch_data.c +++ b/src/host/layer23/src/mobile/tch_data.c @@ -407,7 +407,7 @@ OSMO_ASSERT(0); } - return gsm48_rr_tx_traffic(ms, nmsg); + return tch_send_msg(ms, nmsg); } static int tch_data_check_bcap(const struct gsm_mncc_bearer_cap *bcap) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35862?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icd5b5fad835feecd96a83fa5c83ed08037826fa6 Gerrit-Change-Number: 35862 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmocom-bb[master]: mobile: init TCH state earlier (on receipt of CC ALERTING)
by fixeria 05 Feb '24

05 Feb '24

Attention is currently required from: jolly, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email ) Change subject: mobile: init TCH state earlier (on receipt of CC ALERTING) ...................................................................... Patch Set 1: (4 comments) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/35739/comment/9f6dcbb5_eddff0b7 PS1, Line 9: The MS would usually start receiving traffic indications with > I'm not really understanding the patch together with the commit description. […] I've updated the COMMIT_MSG, hope it's better now. https://gerrit.osmocom.org/c/osmocom-bb/+/35739/comment/4eda016a_c132c67a PS1, Line 10: dial tone > ringback tone Done File src/host/layer23/src/mobile/tch.c: https://gerrit.osmocom.org/c/osmocom-bb/+/35739/comment/855a65d4_0bb2dacd PS1, Line 184: GSM_CSTATE_CALL_DELIVERED > No traffic during data call. Maybe activate data call traffic when call is connected. […] Done https://gerrit.osmocom.org/c/osmocom-bb/+/35739/comment/d8a857d9_c7bebaa3 PS1, Line 185: GSM_CSTATE_CALL_RECEIVED: > there is no audio in any direction while the phone (mobile terminated call) is ringing. Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idd32c823639cc1f9999d77fcefe7e260e31a85ec Gerrit-Change-Number: 35739 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 Feb 2024 18:05:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: rlcmac: refactor gprs_rlcmac_rlc_ul_window_move_window()
by pespin 05 Feb '24

05 Feb '24

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/35861?usp=email ) Change subject: rlcmac: refactor gprs_rlcmac_rlc_ul_window_move_window() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/35861?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic0efd2f84a17d287b73261c102bca84e8274bb2a Gerrit-Change-Number: 35861 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 Feb 2024 17:42:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-trx[master]: osmo-trx-ms: bump osmocom-bb submodule commit
by pespin 05 Feb '24

05 Feb '24

Attention is currently required from: Hoernchen, fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/35859?usp=email ) Change subject: osmo-trx-ms: bump osmocom-bb submodule commit ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/35859?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I8afdc072e132c82f760aa8eae705e622a7fae963 Gerrit-Change-Number: 35859 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 Feb 2024 17:41:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in pysim[master]: pylint: ts_102_222.py
by laforge 05 Feb '24

05 Feb '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35848?usp=email ) Change subject: pylint: ts_102_222.py ...................................................................... pylint: ts_102_222.py pySim/ts_102_222.py:195:0: W0311: Bad indentation. Found 15 spaces, expected 12 (bad-indentation) pySim/ts_102_222.py:201:0: W0311: Bad indentation. Found 15 spaces, expected 12 (bad-indentation) pySim/ts_102_222.py:26:0: W0401: Wildcard import pySim.exceptions (wildcard-import) pySim/ts_102_222.py:35:4: W0246: Useless parent or super() delegation in method '__init__' (useless-parent-delegation) pySim/ts_102_222.py:52:9: W0612: Unused variable 'data' (unused-variable) pySim/ts_102_222.py:52:15: W0612: Unused variable 'sw' (unused-variable) pySim/ts_102_222.py:73:9: W0612: Unused variable 'data' (unused-variable) pySim/ts_102_222.py:73:15: W0612: Unused variable 'sw' (unused-variable) pySim/ts_102_222.py:89:9: W0612: Unused variable 'data' (unused-variable) pySim/ts_102_222.py:89:15: W0612: Unused variable 'sw' (unused-variable) pySim/ts_102_222.py:107:9: W0612: Unused variable 'data' (unused-variable) pySim/ts_102_222.py:107:15: W0612: Unused variable 'sw' (unused-variable) pySim/ts_102_222.py:152:9: W0612: Unused variable 'data' (unused-variable) pySim/ts_102_222.py:152:15: W0612: Unused variable 'sw' (unused-variable) pySim/ts_102_222.py:203:9: W0612: Unused variable 'data' (unused-variable) pySim/ts_102_222.py:203:15: W0612: Unused variable 'sw' (unused-variable) pySim/ts_102_222.py:220:9: W0612: Unused variable 'data' (unused-variable) pySim/ts_102_222.py:220:15: W0612: Unused variable 'sw' (unused-variable) pySim/ts_102_222.py:24:0: C0411: standard import "import argparse" should be placed before "import cmd2" (wrong-import-order) pySim/ts_102_222.py:23:0: W0611: Unused with_argparser imported from cmd2 (unused-import) pySim/ts_102_222.py:27:0: W0611: Unused h2b imported from pySim.utils (unused-import) pySim/ts_102_222.py:27:0: W0611: Unused swap_nibbles imported from pySim.utils (unused-import) pySim/ts_102_222.py:27:0: W0611: Unused JsonEncoder imported from pySim.utils (unused-import) pySim/ts_102_222.py:26:0: W0614: Unused import(s) NoCardError, ProtocolError, ReaderError and SwMatchError from wildcard import of pySim.exceptions (unused-wildcard-import) Change-Id: If251c6cb10e637a13adaaf3ae848501908b9c345 --- M pySim/ts_102_222.py 1 file changed, 52 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_102_222.py b/pySim/ts_102_222.py index ef6f69d..4834ce8 100644 --- a/pySim/ts_102_222.py +++ b/pySim/ts_102_222.py @@ -18,13 +18,12 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. from typing import List - -import cmd2 -from cmd2 import CommandSet, with_default_category, with_argparser import argparse -from pySim.exceptions import * -from pySim.utils import h2b, swap_nibbles, b2h, JsonEncoder, auto_uint8, auto_uint16 +import cmd2 +from cmd2 import CommandSet, with_default_category + +from pySim.utils import b2h, auto_uint8, auto_uint16, is_hexstr from pySim.ts_102_221 import * @@ -32,9 +31,6 @@ class Ts102222Commands(CommandSet): """Administrative commands for telecommunication applications.""" - def __init__(self): - super().__init__() - delfile_parser = argparse.ArgumentParser() delfile_parser.add_argument('--force-delete', action='store_true', help='I really want to permanently delete the file. I know pySim cannot re-create it yet!') @@ -49,7 +45,7 @@ self._cmd.perror("Refusing to permanently delete the file, please read the help text.") return f = self._cmd.lchan.get_file_for_selectable(opts.NAME) - (data, sw) = self._cmd.lchan.scc.delete_file(f.fid) + (_data, _sw) = self._cmd.lchan.scc.delete_file(f.fid) def complete_delete_file(self, text, line, begidx, endidx) -> List[str]: """Command Line tab completion for DELETE FILE""" @@ -70,7 +66,7 @@ self._cmd.perror("Refusing to terminate the file, please read the help text.") return f = self._cmd.lchan.get_file_for_selectable(opts.NAME) - (data, sw) = self._cmd.lchan.scc.terminate_df(f.fid) + (_data, _sw) = self._cmd.lchan.scc.terminate_df(f.fid) def complete_terminate_df(self, text, line, begidx, endidx) -> List[str]: """Command Line tab completion for TERMINATE DF""" @@ -86,7 +82,7 @@ self._cmd.perror("Refusing to terminate the file, please read the help text.") return f = self._cmd.lchan.get_file_for_selectable(opts.NAME) - (data, sw) = self._cmd.lchan.scc.terminate_ef(f.fid) + (_data, _sw) = self._cmd.lchan.scc.terminate_ef(f.fid) def complete_terminate_ef(self, text, line, begidx, endidx) -> List[str]: """Command Line tab completion for TERMINATE EF""" @@ -104,7 +100,7 @@ if not opts.force_terminate_card: self._cmd.perror("Refusing to permanently terminate the card, please read the help text.") return - (data, sw) = self._cmd.lchan.scc.terminate_card_usage() + (_data, _sw) = self._cmd.lchan.scc.terminate_card_usage() create_parser = argparse.ArgumentParser() create_parser.add_argument('FILE_ID', type=is_hexstr, help='File Identifier as 4-character hex string') @@ -149,7 +145,7 @@ ShortFileIdentifier(decoded=opts.short_file_id), ] fcp = FcpTemplate(children=ies) - (data, sw) = self._cmd.lchan.scc.create_file(b2h(fcp.to_tlv())) + (_data, _sw) = self._cmd.lchan.scc.create_file(b2h(fcp.to_tlv())) # the newly-created file is automatically selected but our runtime state knows nothing of it self._cmd.lchan.select_file(self._cmd.lchan.selected_file) @@ -192,15 +188,15 @@ ies.append(TotalFileSize(decoded=opts.total_file_size)) # TODO: Spec states PIN Status Template DO is mandatory if opts.permit_rfm_create or opts.permit_rfm_delete_terminate or opts.permit_other_applet_create or opts.permit_other_applet_delete_terminate: - toolkit_ac = { - 'rfm_create': opts.permit_rfm_create, - 'rfm_delete_terminate': opts.permit_rfm_delete_terminate, - 'other_applet_create': opts.permit_other_applet_create, - 'other_applet_delete_terminate': opts.permit_other_applet_delete_terminate, - } - ies.append(ProprietaryInformation(children=[ToolkitAccessConditions(decoded=toolkit_ac)])) + toolkit_ac = { + 'rfm_create': opts.permit_rfm_create, + 'rfm_delete_terminate': opts.permit_rfm_delete_terminate, + 'other_applet_create': opts.permit_other_applet_create, + 'other_applet_delete_terminate': opts.permit_other_applet_delete_terminate, + } + ies.append(ProprietaryInformation(children=[ToolkitAccessConditions(decoded=toolkit_ac)])) fcp = FcpTemplate(children=ies) - (data, sw) = self._cmd.lchan.scc.create_file(b2h(fcp.to_tlv())) + (_data, _sw) = self._cmd.lchan.scc.create_file(b2h(fcp.to_tlv())) # the newly-created file is automatically selected but our runtime state knows nothing of it self._cmd.lchan.select_file(self._cmd.lchan.selected_file) @@ -217,7 +213,7 @@ ies = [FileIdentifier(decoded=f.fid), FileSize(decoded=opts.file_size)] fcp = FcpTemplate(children=ies) - (data, sw) = self._cmd.lchan.scc.resize_file(b2h(fcp.to_tlv())) + (_data, _sw) = self._cmd.lchan.scc.resize_file(b2h(fcp.to_tlv())) # the resized file is automatically selected but our runtime state knows nothing of it self._cmd.lchan.select_file(self._cmd.lchan.selected_file) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35848?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: If251c6cb10e637a13adaaf3ae848501908b9c345 Gerrit-Change-Number: 35848 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 0

[M] Change in pysim[master]: pylint: utils.py
by laforge 05 Feb '24

05 Feb '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35849?usp=email ) Change subject: pylint: utils.py ...................................................................... pylint: utils.py pySim/utils.py:903:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) pySim/utils.py:153:16: R1719: The if expression can be replaced with 'bool(test)' (simplifiable-if-expression) pySim/utils.py:158:16: R1719: The if expression can be replaced with 'bool(test)' (simplifiable-if-expression) pySim/utils.py:166:16: R1719: The if expression can be replaced with 'bool(test)' (simplifiable-if-expression) pySim/utils.py:222:19: R1719: The if expression can be replaced with 'not test' (simplifiable-if-expression) pySim/utils.py:237:18: R1719: The if expression can be replaced with 'bool(test)' (simplifiable-if-expression) pySim/utils.py:246:19: R1719: The if expression can be replaced with 'not test' (simplifiable-if-expression) pySim/utils.py:279:11: W0612: Unused variable 'remainder' (unused-variable) pySim/utils.py:541:7: R1714: Consider merging these comparisons with 'in' by using 'eutran_bits in (16384, 28672)'. Use a set instead if elements are hashable. (consider-using-in) pySim/utils.py:550:7: R1714: Consider merging these comparisons with 'in' by using 'gsm_bits in (128, 140)'. Use a set instead if elements are hashable. (consider-using-in) pySim/utils.py:614:7: C0121: Comparison 'imsi == None' should be 'imsi is None' (singleton-comparison) pySim/utils.py:627:7: C0121: Comparison 'imsi == None' should be 'imsi is None' (singleton-comparison) pySim/utils.py:733:7: R1714: Consider merging these comparisons with 'in' by using 'msisdn in ('', '+')'. Use a set instead if elements are hashable. (consider-using-in) pySim/utils.py:774:8: W0612: Unused variable 'try_encode' (unused-variable) pySim/utils.py:803:16: W0707: Consider explicitly re-raising using 'except ValueError as exc' and 'raise ValueError('PIN-ADM needs to be hex encoded using this option') from exc' (raise-missing-from) pySim/utils.py:801:16: W0612: Unused variable 'try_encode' (unused-variable) pySim/utils.py:821:7: C1802: Do not use `len(SEQUENCE)` without comparison to determine if a sequence is empty (use-implicit-booleaness-not-len) pySim/utils.py:836:4: W0612: Unused variable 'e' (unused-variable) pySim/utils.py:892:7: C0121: Comparison 'str_list == None' should be 'str_list is None' (singleton-comparison) pySim/utils.py:991:11: R1701: Consider merging these isinstance calls to isinstance(o, (BytesIO, bytearray, bytes)) (consider-merging-isinstance) Change-Id: I190ae75964ef6e0ed43fae994693a8bccd21c7f7 --- M pySim/utils.py 1 file changed, 51 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/utils.py b/pySim/utils.py index 73e5040..86874ba 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -150,12 +150,12 @@ # three-byte tag tag = (binary[1] & 0x7f) << 8 tag |= binary[2] - compr = True if binary[1] & 0x80 else False + compr = bool(binary[1] & 0x80) return ({'comprehension': compr, 'tag': tag}, binary[3:]) else: # single byte tag tag = binary[0] & 0x7f - compr = True if binary[0] & 0x80 else False + compr = bool(binary[0] & 0x80) return ({'comprehension': compr, 'tag': tag}, binary[1:]) @@ -163,7 +163,7 @@ """Encode a single Tag according to ETSI TS 101 220 Section 7.1.1""" # permit caller to specify tag also as integer value if isinstance(tag, int): - compr = True if tag < 0xff and tag & 0x80 else False + compr = bool(tag < 0xff and tag & 0x80) tag = {'tag': tag, 'comprehension': compr} compr = tag.get('comprehension', False) if tag['tag'] in [0x00, 0x80, 0xff] or tag['tag'] > 0xff: @@ -219,7 +219,7 @@ i = 1 last = False while not last: - last = False if binary[i] & 0x80 else True + last = not bool(binary[i] & 0x80) tag <<= 8 tag |= binary[i] i += 1 @@ -234,7 +234,7 @@ Tuple of ({class:int, constructed:bool, tag:int}, remainder:bytes) """ cls = binary[0] >> 6 - constructed = True if binary[0] & 0x20 else False + constructed = bool(binary[0] & 0x20) tag = binary[0] & 0x1f if tag <= 30: return ({'class': cls, 'constructed': constructed, 'tag': tag}, binary[1:]) @@ -243,7 +243,7 @@ i = 1 last = False while not last: - last = False if binary[i] & 0x80 else True + last = not bool(binary[i] & 0x80) tag <<= 7 tag |= binary[i] & 0x7f i += 1 @@ -276,7 +276,7 @@ if isinstance(t, int): # first convert to a dict representation tag_size = count_int_bytes(t) - t, remainder = bertlv_parse_tag(t.to_bytes(tag_size, 'big')) + t, _remainder = bertlv_parse_tag(t.to_bytes(tag_size, 'big')) tag = t['tag'] constructed = t['constructed'] cls = t['class'] @@ -538,7 +538,7 @@ sel.add(a['name']) # TS 31.102 Section 4.2.5 Table 4.2.5.1 eutran_bits = u16t & 0x7000 - if eutran_bits == 0x4000 or eutran_bits == 0x7000: + if eutran_bits in [0x4000, 0x7000]: sel.add("E-UTRAN WB-S1") sel.add("E-UTRAN NB-S1") elif eutran_bits == 0x5000: @@ -547,7 +547,7 @@ sel.add("E-UTRAN WB-S1") # TS 31.102 Section 4.2.5 Table 4.2.5.2 gsm_bits = u16t & 0x008C - if gsm_bits == 0x0080 or gsm_bits == 0x008C: + if gsm_bits in [0x0080, 0x008C]: sel.add("GSM") sel.add("EC-GSM-IoT") elif u16t & 0x008C == 0x0084: @@ -611,7 +611,7 @@ """ Derive the MCC (Mobile Country Code) from the first three digits of an IMSI """ - if imsi == None: + if imsi is None: return None if len(imsi) > 3: @@ -624,7 +624,7 @@ """ Derive the MNC (Mobile Country Code) from the 4th to 6th digit of an IMSI """ - if imsi == None: + if imsi is None: return None if len(imsi) > 3: @@ -730,7 +730,7 @@ """ # If no MSISDN is supplied then encode the file contents as all "ff" - if msisdn == "" or msisdn == "+": + if msisdn in ["", "+"]: return "ff" * 14 # Leading '+' indicates International Number @@ -771,7 +771,7 @@ # Try actual encoding to be sure try: - try_encode = h2b(string) + _try_encode = h2b(string) return True except: return False @@ -799,12 +799,10 @@ # Ensure that it's hex-encoded try: try_encode = h2b(pin_adm) - except ValueError: - raise ValueError( - "PIN-ADM needs to be hex encoded using this option") + except ValueError as exc: + raise ValueError("PIN-ADM needs to be hex encoded using this option") from exc else: - raise ValueError( - "PIN-ADM needs to be exactly 16 digits (hex encoded)") + raise ValueError("PIN-ADM needs to be exactly 16 digits (hex encoded)") return pin_adm @@ -818,7 +816,7 @@ """ # Empty address string - if not len(addr): + if len(addr) == 0: return None addr_list = addr.split('.') @@ -833,7 +831,7 @@ return 0x01 elif ipa.version == 6: return 0x02 - except Exception as e: + except Exception: invalid_ipv4 = True for i in addr_list: # Invalid IPv4 may qualify for a valid FQDN, so make check here @@ -889,7 +887,7 @@ Returns: multi-line string containing formatted table """ - if str_list == None: + if str_list is None: return "" if len(str_list) <= 0: return "" @@ -900,7 +898,7 @@ table = [] for i in iter(range(rows)): str_list_row = str_list[i::rows] - if (align_left): + if align_left: format_str_cell = '%%-%ds' else: format_str_cell = '%%%ds' @@ -988,7 +986,7 @@ """Extend the standard library JSONEncoder with support for more types.""" def default(self, o): - if isinstance(o, BytesIO) or isinstance(o, bytes) or isinstance(o, bytearray): + if isinstance(o, (BytesIO, bytes, bytearray)): return b2h(o) elif isinstance(o, datetime.datetime): return o.isoformat() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35849?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: I190ae75964ef6e0ed43fae994693a8bccd21c7f7 Gerrit-Change-Number: 35849 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 0

2026

2025

2024

2023

2022

gerrit-log