- gerrit-log - lists.osmocom.org

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

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35810?usp=email ) Change subject: pylint: gsmtap.py ...................................................................... pylint: gsmtap.py pySim/gsmtap.py:28:0: W0401: Wildcard import construct (wildcard-import) pySim/gsmtap.py:26:0: W0611: Unused List imported from typing (unused-import) pySim/gsmtap.py:26:0: W0611: Unused Dict imported from typing (unused-import) pySim/gsmtap.py:26:0: W0611: Unused Optional imported from typing (unused-import) Change-Id: I53739874edef0a9ae25a8599e7cc7eee9dedb703 --- M pySim/gsmtap.py 1 file changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/10/35810/1 diff --git a/pySim/gsmtap.py b/pySim/gsmtap.py index 48a7af7..f113aeb 100644 --- a/pySim/gsmtap.py +++ b/pySim/gsmtap.py @@ -23,9 +23,9 @@ # import socket -from typing import List, Dict, Optional from construct import Optional as COptional -from construct import * +from construct import Int8ub, Int8sb, Int32ub, BitStruct, Enum, GreedyBytes, Struct, Switch +from construct import this, PaddedString from pySim.construct import * # The root definition of GSMTAP can be found at -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35810?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: I53739874edef0a9ae25a8599e7cc7eee9dedb703 Gerrit-Change-Number: 35810 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

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

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35812?usp=email ) Change subject: pylint: exceptions.py ...................................................................... pylint: exceptions.py pySim/exceptions.py:27:4: W0107: Unnecessary pass statement (unnecessary-pass) pySim/exceptions.py:32:4: W0107: Unnecessary pass statement (unnecessary-pass) pySim/exceptions.py:37:4: W0107: Unnecessary pass statement (unnecessary-pass) Change-Id: Ibd0725ceb5fdcdc0995c39a4449ada2fd6088552 --- M pySim/exceptions.py 1 file changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/12/35812/1 diff --git a/pySim/exceptions.py b/pySim/exceptions.py index c6a81a1..f726aa6 100644 --- a/pySim/exceptions.py +++ b/pySim/exceptions.py @@ -24,17 +24,14 @@ class NoCardError(Exception): """No card was found in the reader.""" - pass class ProtocolError(Exception): """Some kind of protocol level error interfacing with the card.""" - pass class ReaderError(Exception): """Some kind of general error with the card reader.""" - pass class SwMatchError(Exception): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35812?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: Ibd0725ceb5fdcdc0995c39a4449ada2fd6088552 Gerrit-Change-Number: 35812 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

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

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35813?usp=email ) Change subject: pylint: ota.py ...................................................................... pylint: ota.py pySim/ota.py:21:0: W0401: Wildcard import construct (wildcard-import) pySim/ota.py:129:8: R1705: Unnecessary "elif" after "return", remove the leading "el" from "elif" (no-else-return) pySim/ota.py:150:8: W0107: Unnecessary pass statement (unnecessary-pass) pySim/ota.py:192:8: W0612: Unused variable 'padded_data' (unused-variable) pySim/ota.py:202:8: W0107: Unnecessary pass statement (unnecessary-pass) pySim/ota.py:207:8: W0107: Unnecessary pass statement (unnecessary-pass) pySim/ota.py:210:4: C0103: Method name "fromKeyset" doesn't conform to snake_case naming style (invalid-name) pySim/ota.py:239:8: W0107: Unnecessary pass statement (unnecessary-pass) pySim/ota.py:242:4: C0103: Method name "fromKeyset" doesn't conform to snake_case naming style (invalid-name) pySim/ota.py:328:4: W0221: Number of parameters was 4 in 'OtaDialect.encode_cmd' and is now 5 in overriding 'OtaDialectSms.encode_cmd' method (arguments-differ) pySim/ota.py:392:4: W0221: Number of parameters was 3 in 'OtaDialect.decode_resp' and is now 4 in overriding 'OtaDialectSms.decode_resp' method (arguments-differ) Change-Id: Icb8d690e541dbaf1406085a8446a0c67641fefff --- M pySim/ota.py 1 file changed, 37 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/13/35813/1 diff --git a/pySim/ota.py b/pySim/ota.py index 5955a08..14bad56 100644 --- a/pySim/ota.py +++ b/pySim/ota.py @@ -15,14 +15,16 @@ # 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 pySim.construct import * -from pySim.utils import b2h -from pySim.sms import UserDataHeader -from construct import * import zlib import abc import struct from typing import Optional +from construct import Enum, Int8ub, Int16ub, Struct, Bytes, GreedyBytes, BitsInteger, BitStruct +from construct import Flag, Padding, Switch, this + +from pySim.construct import * +from pySim.utils import b2h +from pySim.sms import UserDataHeader # ETS TS 102 225 gives the general command structure and the dialects for CAT_TP, TCP/IP and HTTPS # 3GPP TS 31.115 gives the dialects for SMS-PP, SMS-CB, USSD and HTTP @@ -112,12 +114,12 @@ @property def auth(self): """Return an instance of the matching OtaAlgoAuth.""" - return OtaAlgoAuth.fromKeyset(self) + return OtaAlgoAuth.from_keyset(self) @property def crypt(self): """Return an instance of the matching OtaAlgoCrypt.""" - return OtaAlgoCrypt.fromKeyset(self) + return OtaAlgoCrypt.from_keyset(self) class OtaCheckError(Exception): pass @@ -128,26 +130,24 @@ def _compute_sig_len(self, spi:SPI): if spi['rc_cc_ds'] == 'no_rc_cc_ds': return 0 - elif spi['rc_cc_ds'] == 'rc': # CRC-32 + if spi['rc_cc_ds'] == 'rc': # CRC-32 return 4 - elif spi['rc_cc_ds'] == 'cc': # Cryptographic Checksum (CC) + if spi['rc_cc_ds'] == 'cc': # Cryptographic Checksum (CC) # TODO: this is not entirely correct, as in AES case it could be 4 or 8 return 8 - else: - raise ValueError("Invalid rc_cc_ds: %s" % spi['rc_cc_ds']) + raise ValueError("Invalid rc_cc_ds: %s" % spi['rc_cc_ds']) @abc.abstractmethod - def encode_cmd(self, otak: OtaKeyset, tar: bytes, apdu: bytes) -> bytes: + def encode_cmd(self, otak: OtaKeyset, tar: bytes, spi: dict, apdu: bytes) -> bytes: pass @abc.abstractmethod - def decode_resp(self, otak: OtaKeyset, apdu: bytes) -> (object, Optional["CompactRemoteResp"]): + def decode_resp(self, otak: OtaKeyset, spi: dict, apdu: bytes) -> (object, Optional["CompactRemoteResp"]): """Decode a response into a response packet and, if indicted (by a response status of `"por_ok"`) a decoded response. The response packet's common characteristics are not fully determined, and (so far) completely proprietary per dialect.""" - pass from Cryptodome.Cipher import DES, DES3, AES @@ -190,7 +190,7 @@ def encrypt(self, data:bytes) -> bytes: """Encrypt given input bytes using the key material given in constructor.""" padded_data = self.pad_to_blocksize(data) - return self._encrypt(data) + return self._encrypt(padded_data) def decrypt(self, data:bytes) -> bytes: """Decrypt given input bytes using the key material given in constructor.""" @@ -199,15 +199,13 @@ @abc.abstractmethod def _encrypt(self, data:bytes) -> bytes: """Actual implementation, to be implemented by derived class.""" - pass @abc.abstractmethod def _decrypt(self, data:bytes) -> bytes: """Actual implementation, to be implemented by derived class.""" - pass @classmethod - def fromKeyset(cls, otak: OtaKeyset) -> 'OtaAlgoCrypt': + def from_keyset(cls, otak: OtaKeyset) -> 'OtaAlgoCrypt': """Resolve the class for the encryption algorithm of otak and instantiate it.""" for subc in cls.__subclasses__(): if subc.enum_name == otak.algo_crypt: @@ -239,7 +237,7 @@ pass @classmethod - def fromKeyset(cls, otak: OtaKeyset) -> 'OtaAlgoAuth': + def from_keyset(cls, otak: OtaKeyset) -> 'OtaAlgoAuth': """Resolve the class for the authentication algorithm of otak and instantiate it.""" for subc in cls.__subclasses__(): if subc.enum_name == otak.algo_auth: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35813?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: Icb8d690e541dbaf1406085a8446a0c67641fefff Gerrit-Change-Number: 35813 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

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

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35815?usp=email ) Change subject: pylint: profile.py ...................................................................... pylint: profile.py pySim/profile.py:169:0: C0325: Unnecessary parens after 'assert' keyword (superfluous-parens) pySim/profile.py:189:8: W0107: Unnecessary pass statement (unnecessary-pass) pySim/profile.py:197:8: W0107: Unnecessary pass statement (unnecessary-pass) pySim/profile.py:27:0: C0411: standard import "import abc" should be placed before "from pySim.commands import SimCardCommands" (wrong-import-order) pySim/profile.py:28:0: C0411: standard import "import operator" should be placed before "from pySim.commands import SimCardCommands" (wrong-import-order) pySim/profile.py:29:0: C0411: standard import "from typing import List" should be placed before "from pySim.commands import SimCardCommands" (wrong-import-order) Change-Id: Ifd55e8ab5ab04da06c8d11e50bc15740580b2900 --- M pySim/profile.py 1 file changed, 20 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/15/35815/1 diff --git a/pySim/profile.py b/pySim/profile.py index 0d09e81..74946ba 100644 --- a/pySim/profile.py +++ b/pySim/profile.py @@ -21,13 +21,13 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from pySim.commands import SimCardCommands -from pySim.filesystem import CardApplication, interpret_sw -from pySim.utils import all_subclasses import abc import operator from typing import List +from pySim.commands import SimCardCommands +from pySim.filesystem import CardApplication, interpret_sw +from pySim.utils import all_subclasses def _mf_select_test(scc: SimCardCommands, cla_byte: str, sel_ctrl: str, @@ -166,7 +166,7 @@ return None def add_addon(self, addon: 'CardProfileAddon'): - assert(addon not in self.addons) + assert addon not in self.addons # we don't install any additional files, as that is happening in the RuntimeState. self.addons.append(addon) @@ -186,7 +186,6 @@ self.desc = kw.get("desc", None) self.files_in_mf = kw.get("files_in_mf", []) self.shell_cmdsets = kw.get("shell_cmdsets", []) - pass def __str__(self): return self.name @@ -194,4 +193,3 @@ @abc.abstractmethod def probe(self, card: 'CardBase') -> bool: """Probe a given card to determine whether or not this add-on is present/supported.""" - pass -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35815?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: Ifd55e8ab5ab04da06c8d11e50bc15740580b2900 Gerrit-Change-Number: 35815 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

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

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35816?usp=email ) Change subject: pylint: ts_31_102_telecom.py ...................................................................... pylint: ts_31_102_telecom.py pySim/ts_31_102_telecom.py:45:0: C0325: Unnecessary parens after '=' keyword (superfluous-parens) pySim/ts_31_102_telecom.py:33:0: W0401: Wildcard import construct (wildcard-import) pySim/ts_31_102_telecom.py:76:15: C0121: Comparison 'in_json[srv]['activated'] == True' should be 'in_json[srv]['activated'] is True' if checking for the singleton value True, or 'in_json[srv]['activated']' if testing for truthiness (singleton-comparison) pySim/ts_31_102_telecom.py:85:23: W0612: Unused variable 'sw' (unused-variable) pySim/ts_31_102_telecom.py:124:22: W0612: Unused variable 'sw' (unused-variable) pySim/ts_31_102_telecom.py:32:0: C0411: third party import "from construct import Optional as COptional" should be placed before "from pySim.tlv import *" (wrong-import-order) pySim/ts_31_102_telecom.py:33:0: C0411: third party import "from construct import *" should be placed before "from pySim.tlv import *" (wrong-import-order) Change-Id: I4ee0d0e1b5b418b8527b4674141cbaef896a64a2 --- M pySim/ts_31_102_telecom.py 1 file changed, 24 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/16/35816/1 diff --git a/pySim/ts_31_102_telecom.py b/pySim/ts_31_102_telecom.py index 575ccae..962b7dd 100644 --- a/pySim/ts_31_102_telecom.py +++ b/pySim/ts_31_102_telecom.py @@ -26,11 +26,12 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # +from construct import Optional as COptional +from construct import Struct, Int16ub, Int32ub + from pySim.tlv import * from pySim.filesystem import * from pySim.construct import * -from construct import Optional as COptional -from construct import * # TS 31.102 Section 4.2.8 class EF_UServiceTable(TransparentEF): @@ -42,7 +43,7 @@ def _bit_byte_offset_for_service(service: int) -> Tuple[int, int]: i = service - 1 byte_offset = i//8 - bit_offset = (i % 8) + bit_offset = i % 8 return (byte_offset, bit_offset) def _decode_bin(self, in_bin): @@ -73,7 +74,7 @@ service_nr = int(srv) (byte_offset, bit_offset) = EF_UServiceTable._bit_byte_offset_for_service( service_nr) - if in_json[srv]['activated'] == True: + if in_json[srv]['activated'] is True: bit = 1 else: bit = 0 @@ -82,7 +83,7 @@ def get_active_services(self, cmd): # obtain list of currently active services - (service_data, sw) = cmd.lchan.read_binary_dec() + (service_data, _sw) = cmd.lchan.read_binary_dec() active_services = [] for s in service_data.keys(): if service_data[s]['activated']: @@ -121,7 +122,7 @@ return num_problems def ust_update(self, cmd, activate=[], deactivate=[]): - service_data, sw = cmd.lchan.read_binary() + service_data, _sw = cmd.lchan.read_binary() service_data = h2b(service_data) for service in activate: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35816?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: I4ee0d0e1b5b418b8527b4674141cbaef896a64a2 Gerrit-Change-Number: 35816 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

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

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35814?usp=email ) Change subject: pylint: sms.py ...................................................................... pylint: sms.py pySim/sms.py:23:0: W0404: Reimport 'Flag' (imported line 23) (reimported) pySim/sms.py:54:4: C0103: Method name "fromBytes" doesn't conform to snake_case naming style (invalid-name) pySim/sms.py:60:4: C0103: Method name "toBytes" doesn't conform to snake_case naming style (invalid-name) pySim/sms.py:120:4: C0103: Method name "fromBytes" doesn't conform to snake_case naming style (invalid-name) pySim/sms.py:132:4: C0103: Method name "fromSmpp" doesn't conform to snake_case naming style (invalid-name) pySim/sms.py:137:4: C0103: Method name "toSmpp" doesn't conform to snake_case naming style (invalid-name) pySim/sms.py:141:4: C0103: Method name "toBytes" doesn't conform to snake_case naming style (invalid-name) pySim/sms.py:188:4: C0103: Method name "fromBytes" doesn't conform to snake_case naming style (invalid-name) pySim/sms.py:192:8: W0612: Unused variable 'flags' (unused-variable) pySim/sms.py:209:4: C0103: Method name "toBytes" doesn't conform to snake_case naming style (invalid-name) pySim/sms.py:228:4: C0103: Method name "fromSmpp" doesn't conform to snake_case naming style (invalid-name) pySim/sms.py:236:4: C0103: Method name "fromSmppSubmit" doesn't conform to snake_case naming style (invalid-name) pySim/sms.py:279:4: C0103: Method name "fromBytes" doesn't conform to snake_case naming style (invalid-name) pySim/sms.py:306:12: W0107: Unnecessary pass statement (unnecessary-pass) pySim/sms.py:311:12: W0107: Unnecessary pass statement (unnecessary-pass) pySim/sms.py:319:4: C0103: Method name "toBytes" doesn't conform to snake_case naming style (invalid-name) pySim/sms.py:339:4: C0103: Method name "fromSmpp" doesn't conform to snake_case naming style (invalid-name) pySim/sms.py:347:4: C0103: Method name "fromSmppSubmit" doesn't conform to snake_case naming style (invalid-name) pySim/sms.py:373:4: C0103: Method name "toSmpp" doesn't conform to snake_case naming style (invalid-nam Change-Id: I8082a01443ef568eebda696239572f0af7b56f1b --- M pySim/iso7816_4.py M pySim/sms.py M tests/test_sms.py 3 files changed, 78 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/14/35814/1 diff --git a/pySim/iso7816_4.py b/pySim/iso7816_4.py index 9d1229e..64d814d 100644 --- a/pySim/iso7816_4.py +++ b/pySim/iso7816_4.py @@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. """ -from construct import GreedyBytes +from construct import GreedyBytes, GreedyString from pySim.construct import * from pySim.utils import * from pySim.filesystem import * diff --git a/pySim/sms.py b/pySim/sms.py index 88ee27a..3a2e990 100644 --- a/pySim/sms.py +++ b/pySim/sms.py @@ -20,7 +20,7 @@ import typing import abc from bidict import bidict -from construct import Int8ub, Byte, Bytes, Bit, Flag, BitsInteger, Flag +from construct import Int8ub, Byte, Bytes, Bit, Flag, BitsInteger from construct import Struct, Enum, Tell, BitStruct, this, Padding from construct import Prefixed, GreedyRange, GreedyBytes @@ -51,13 +51,13 @@ return False @classmethod - def fromBytes(cls, inb: BytesOrHex) -> typing.Tuple['UserDataHeader', bytes]: + def from_bytes(cls, inb: BytesOrHex) -> typing.Tuple['UserDataHeader', bytes]: if isinstance(inb, str): inb = h2b(inb) res = cls._construct.parse(inb) return cls(res['ies']), res['data'] - def toBytes(self) -> bytes: + def to_bytes(self) -> bytes: return self._construct.build({'ies':self.ies, 'data':b''}) @@ -117,7 +117,7 @@ return 'AddressField(TON=%s, NPI=%s, %s)' % (self.ton, self.npi, self.digits) @classmethod - def fromBytes(cls, inb: BytesOrHex) -> typing.Tuple['AddressField', bytes]: + def from_bytes(cls, inb: BytesOrHex) -> typing.Tuple['AddressField', bytes]: """Construct an AddressField instance from the binary T-PDU address format.""" if isinstance(inb, str): inb = h2b(inb) @@ -129,16 +129,16 @@ return cls(res['digits'][:res['addr_len']], ton, npi), inb[res['tell']:] @classmethod - def fromSmpp(cls, addr, ton, npi) -> 'AddressField': + def from_smpp(cls, addr, ton, npi) -> 'AddressField': """Construct an AddressField from {source,dest}_addr_{,ton,npi} attributes of smpp.pdu.""" # return the resulting instance return cls(addr.decode('ascii'), AddressField.smpp_map_ton[ton.name], AddressField.smpp_map_npi[npi.name]) - def toSmpp(self): + def to_smpp(self): """Return smpp.pdo.*.source,dest}_addr_{,ton,npi} attributes for given AddressField.""" return (self.digits, self.smpp_map_ton.inverse[self.ton], self.smpp_map_npi.inverse[self.npi]) - def toBytes(self) -> bytes: + def to_bytes(self) -> bytes: """Encode the AddressField into the binary representation as used in T-PDU.""" num_digits = len(self.digits) if num_digits % 2: @@ -185,13 +185,13 @@ return '%s(MTI=%s, MMS=%s, LP=%s, RP=%s, UDHI=%s, SRI=%s, OA=%s, PID=%2x, DCS=%x, SCTS=%s, UDL=%u, UD=%s)' % (self.__class__.__name__, self.tp_mti, self.tp_mms, self.tp_lp, self.tp_rp, self.tp_udhi, self.tp_sri, self.tp_oa, self.tp_pid, self.tp_dcs, self.tp_scts, self.tp_udl, self.tp_ud) @classmethod - def fromBytes(cls, inb: BytesOrHex) -> 'SMS_DELIVER': + def from_bytes(cls, inb: BytesOrHex) -> 'SMS_DELIVER': """Construct a SMS_DELIVER instance from the binary encoded format as used in T-PDU.""" if isinstance(inb, str): inb = h2b(inb) flags = inb[0] - d = SMS_DELIVER.flags_construct.parse(inb) - oa, remainder = AddressField.fromBytes(inb[1:]) + d = SMS_DELIVER.flags_construct.parse(flags) + oa, remainder = AddressField.from_bytes(inb[1:]) d['tp_oa'] = oa offset = 0 d['tp_pid'] = remainder[offset] @@ -206,7 +206,7 @@ d['tp_ud'] = remainder[offset:] return cls(**d) - def toBytes(self) -> bytes: + def to_bytes(self) -> bytes: """Encode a SMS_DELIVER instance to the binary encoded format as used in T-PDU.""" outb = bytearray() d = { @@ -215,7 +215,7 @@ } flags = SMS_DELIVER.flags_construct.build(d) outb.extend(flags) - outb.extend(self.tp_oa.toBytes()) + outb.extend(self.tp_oa.to_bytes()) outb.append(self.tp_pid) outb.append(self.tp_dcs) outb.extend(self.tp_scts) @@ -225,18 +225,18 @@ return outb @classmethod - def fromSmpp(cls, smpp_pdu) -> 'SMS_DELIVER': + def from_smpp(cls, smpp_pdu) -> 'SMS_DELIVER': """Construct a SMS_DELIVER instance from the deliver format used by smpp.pdu.""" if smpp_pdu.id == pdu_types.CommandId.submit_sm: - return cls.fromSmppSubmit(smpp_pdu) + return cls.from_smpp_submit(smpp_pdu) else: raise ValueError('Unsupported SMPP commandId %s' % smpp_pdu.id) @classmethod - def fromSmppSubmit(cls, smpp_pdu) -> 'SMS_DELIVER': + def from_smpp_submit(cls, smpp_pdu) -> 'SMS_DELIVER': """Construct a SMS_DELIVER instance from the submit format used by smpp.pdu.""" ensure_smpp_is_8bit(smpp_pdu.params['data_coding']) - tp_oa = AddressField.fromSmpp(smpp_pdu.params['source_addr'], + tp_oa = AddressField.from_smpp(smpp_pdu.params['source_addr'], smpp_pdu.params['source_addr_ton'], smpp_pdu.params['source_addr_npi']) tp_ud = smpp_pdu.params['short_message'] @@ -276,7 +276,7 @@ return '%s(MTI=%s, RD=%s, VPF=%u, RP=%s, UDHI=%s, SRR=%s, DA=%s, PID=%2x, DCS=%x, VP=%s, UDL=%u, UD=%s)' % (self.__class__.__name__, self.tp_mti, self.tp_rd, self.tp_vpf, self.tp_rp, self.tp_udhi, self.tp_srr, self.tp_da, self.tp_pid, self.tp_dcs, self.tp_vp, self.tp_udl, self.tp_ud) @classmethod - def fromBytes(cls, inb:BytesOrHex) -> 'SMS_SUBMIT': + def from_bytes(cls, inb:BytesOrHex) -> 'SMS_SUBMIT': """Construct a SMS_SUBMIT instance from the binary encoded format as used in T-PDU.""" offset = 0 if isinstance(inb, str): @@ -285,7 +285,7 @@ offset += 1 d['tp_mr']= inb[offset] offset += 1 - da, remainder = AddressField.fromBytes(inb[2:]) + da, remainder = AddressField.from_bytes(inb[2:]) d['tp_da'] = da offset = 0 @@ -303,12 +303,10 @@ # TODO: further decode d['tp_vp'] = remainder[offset:offset+7] offset += 7 - pass elif d['tp_vpf'] == 'absolute': # TODO: further decode d['tp_vp'] = remainder[offset:offset+7] offset += 7 - pass else: raise ValueError('Invalid VPF: %s' % d['tp_vpf']) d['tp_udl'] = remainder[offset] @@ -316,7 +314,7 @@ d['tp_ud'] = remainder[offset:] return cls(**d) - def toBytes(self) -> bytes: + def to_bytes(self) -> bytes: """Encode a SMS_SUBMIT instance to the binary encoded format as used in T-PDU.""" outb = bytearray() d = { @@ -326,7 +324,7 @@ flags = SMS_SUBMIT.flags_construct.build(d) outb.extend(flags) outb.append(self.tp_mr) - outb.extend(self.tp_da.toBytes()) + outb.extend(self.tp_da.to_bytes()) outb.append(self.tp_pid) outb.append(self.tp_dcs) if self.tp_vpf != 'none': @@ -336,20 +334,20 @@ return outb @classmethod - def fromSmpp(cls, smpp_pdu) -> 'SMS_SUBMIT': + def from_smpp(cls, smpp_pdu) -> 'SMS_SUBMIT': """Construct a SMS_SUBMIT instance from the format used by smpp.pdu.""" if smpp_pdu.id == pdu_types.CommandId.submit_sm: - return cls.fromSmppSubmit(smpp_pdu) + return cls.from_smpp_submit(smpp_pdu) else: raise ValueError('Unsupported SMPP commandId %s' % smpp_pdu.id) @classmethod - def fromSmppSubmit(cls, smpp_pdu) -> 'SMS_SUBMIT': + def from_smpp_submit(cls, smpp_pdu) -> 'SMS_SUBMIT': """Construct a SMS_SUBMIT instance from the submit format used by smpp.pdu.""" ensure_smpp_is_8bit(smpp_pdu.params['data_coding']) - tp_da = AddressField.fromSmpp(smpp_pdu.params['destination_addr'], - smpp_pdu.params['dest_addr_ton'], - smpp_pdu.params['dest_addr_npi']) + tp_da = AddressField.from_smpp(smpp_pdu.params['destination_addr'], + smpp_pdu.params['dest_addr_ton'], + smpp_pdu.params['dest_addr_npi']) tp_ud = smpp_pdu.params['short_message'] #vp_smpp = smpp_pdu.params['validity_period'] #if not vp_smpp: @@ -370,7 +368,7 @@ } return cls(**d) - def toSmpp(self) -> pdu_types.PDU: + def to_smpp(self) -> pdu_types.PDU: """Translate a SMS_SUBMIT instance to a smpp.pdu.operations.SubmitSM instance.""" esm_class = pdu_types.EsmClass(pdu_types.EsmClassMode.DEFAULT, pdu_types.EsmClassType.DEFAULT) reg_del = pdu_types.RegisteredDelivery(pdu_types.RegisteredDeliveryReceipt.NO_SMSC_DELIVERY_RECEIPT_REQUESTED) @@ -382,7 +380,7 @@ if self.tp_dcs != 0xF6: raise ValueError('Unsupported DCS: We only support DCS=0xF6 for now') dc = pdu_types.DataCoding(pdu_types.DataCodingScheme.DEFAULT, pdu_types.DataCodingDefault.OCTET_UNSPECIFIED) - (daddr, ton, npi) = self.tp_da.toSmpp() + (daddr, ton, npi) = self.tp_da.to_smpp() return operations.SubmitSM(service_type='', source_addr_ton=pdu_types.AddrTon.ALPHANUMERIC, source_addr_npi=pdu_types.AddrNpi.UNKNOWN, diff --git a/tests/test_sms.py b/tests/test_sms.py index 8355224..7130399 100644 --- a/tests/test_sms.py +++ b/tests/test_sms.py @@ -6,7 +6,7 @@ class Test_SMS_UDH(unittest.TestCase): def test_single_ie(self): - udh, tail = UserDataHeader.fromBytes('027100') + udh, tail = UserDataHeader.from_bytes('027100') self.assertEqual(len(udh.ies), 1) ie = udh.ies[0] self.assertEqual(ie.iei, 0x71) @@ -15,7 +15,7 @@ self.assertEqual(tail, b'') def test_single_ie_tail(self): - udh, tail = UserDataHeader.fromBytes('027100abcdef') + udh, tail = UserDataHeader.from_bytes('027100abcdef') self.assertEqual(len(udh.ies), 1) ie = udh.ies[0] self.assertEqual(ie.iei, 0x71) @@ -24,7 +24,7 @@ self.assertEqual(tail, b'\xab\xcd\xef') def test_single_ie_value(self): - udh, tail = UserDataHeader.fromBytes('03710110') + udh, tail = UserDataHeader.from_bytes('03710110') self.assertEqual(len(udh.ies), 1) ie = udh.ies[0] self.assertEqual(ie.iei, 0x71) @@ -33,7 +33,7 @@ self.assertEqual(tail, b'') def test_two_ie_data_tail(self): - udh, tail = UserDataHeader.fromBytes('0571007001ffabcd') + udh, tail = UserDataHeader.from_bytes('0571007001ffabcd') self.assertEqual(len(udh.ies), 2) ie = udh.ies[0] self.assertEqual(ie.iei, 0x71) @@ -45,42 +45,42 @@ self.assertEqual(ie.value, b'\xff') self.assertEqual(tail, b'\xab\xcd') - def test_toBytes(self): + def test_to_bytes(self): indata = h2b('0571007001ff') - udh, tail = UserDataHeader.fromBytes(indata) - encoded = udh.toBytes() + udh, tail = UserDataHeader.from_bytes(indata) + encoded = udh.to_bytes() self.assertEqual(encoded, indata) class Test_AddressField(unittest.TestCase): - def test_fromBytes(self): + def test_from_bytes(self): encoded = h2b('0480214399') - af, trailer = AddressField.fromBytes(encoded) + af, trailer = AddressField.from_bytes(encoded) self.assertEqual(trailer, b'\x99') self.assertEqual(af.ton, 'unknown') self.assertEqual(af.npi, 'unknown') self.assertEqual(af.digits, '1234') - def test_fromBytes_odd(self): - af, trailer = AddressField.fromBytes('038021f399') + def test_from_bytes_odd(self): + af, trailer = AddressField.from_bytes('038021f399') self.assertEqual(trailer, b'\x99') self.assertEqual(af.ton, 'unknown') self.assertEqual(af.npi, 'unknown') self.assertEqual(af.digits, '123') - def test_toBytes(self): + def test_to_bytes(self): encoded = h2b('04802143') - af, trailer = AddressField.fromBytes(encoded) - self.assertEqual(af.toBytes(), encoded) + af, trailer = AddressField.from_bytes(encoded) + self.assertEqual(af.to_bytes(), encoded) - def test_toBytes_odd(self): + def test_to_bytes_odd(self): af = AddressField('12345', 'international', 'isdn_e164') - encoded = af.toBytes() + encoded = af.to_bytes() self.assertEqual(encoded, h2b('05912143f5')) class Test_SUBMIT(unittest.TestCase): - def test_fromBytes(self): - s = SMS_SUBMIT.fromBytes('550d0b911614261771f000f5a78c0b050423f423f40003010201424547494e3a56434152440d0a56455253494f4e3a322e310d0a4e3a4d650d0a54454c3b505245463b43454c4c3b564f4943453a2b36313431363237313137300d0a54454c3b484f4d453b564f4943453a2b36313339353337303437310d0a54454c3b574f524b3b564f4943453a2b36313339363734373031350d0a454e443a') + def test_from_bytes(self): + s = SMS_SUBMIT.from_bytes('550d0b911614261771f000f5a78c0b050423f423f40003010201424547494e3a56434152440d0a56455253494f4e3a322e310d0a4e3a4d650d0a54454c3b505245463b43454c4c3b564f4943453a2b36313431363237313137300d0a54454c3b484f4d453b564f4943453a2b36313339353337303437310d0a54454c3b574f524b3b564f4943453a2b36313339363734373031350d0a454e443a') self.assertEqual(s.tp_mti, 1) self.assertEqual(s.tp_rd, True) self.assertEqual(s.tp_vpf, 'relative') @@ -92,8 +92,8 @@ self.assertEqual(s.tp_udl, 140) class Test_DELIVER(unittest.TestCase): - def test_fromBytes(self): - d = SMS_DELIVER.fromBytes('0408D0E5759A0E7FF6907090307513000824010101BB400101') + def test_from_bytes(self): + d = SMS_DELIVER.from_bytes('0408D0E5759A0E7FF6907090307513000824010101BB400101') self.assertEqual(d.tp_mti, 0) self.assertEqual(d.tp_mms, True) self.assertEqual(d.tp_lp, False) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35814?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: I8082a01443ef568eebda696239572f0af7b56f1b Gerrit-Change-Number: 35814 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

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

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35818?usp=email ) Change subject: pylint: cat.py ...................................................................... pylint: cat.py pySim/cat.py:586:4: W0237: Parameter 'do' has been renamed to 'x' in overriding 'PlmnWactList._from_bytes' method (arguments-renamed) pySim/cat.py:981:8: W0120: Else clause on loop without a break statement, remove the else and de-indent all the code inside it (useless-else-on-loop) pySim/cat.py:1000:4: W0221: Number of parameters was 3 in 'TLV_IE_Collection.from_bytes' and is now 2 in overriding 'ProactiveCommand.from_bytes' method (arguments-differ) pySim/cat.py:1010:12: W0612: Unused variable 'dec' (unused-variable) pySim/cat.py:1010:17: W0612: Unused variable 'remainder' (unused-variable) pySim/cat.py:1022:4: W0221: Number of parameters was 2 in 'TLV_IE_Collection.to_bytes' and is now 1 in overriding 'ProactiveCommand.to_bytes' method (arguments-differ) pySim/cat.py:22:0: C0411: standard import "from typing import List" should be placed before "from bidict import bidict" (wrong-import-order) pySim/cat.py:26:0: C0411: third party import "from construct import Int8ub, Int16ub, Byte, Bytes, Bit, Flag, BitsInteger" should be placed before "from pySim.utils import b2h, h2b, dec_xplmn_w_act" (wrong-import-order) pySim/cat.py:27:0: C0411: third party import "from construct import Struct, Enum, Tell, BitStruct, this, Padding, RepeatUntil" should be placed before "from pySim.utils import b2h, h2b, dec_xplmn_w_act" (wrong-import-order) pySim/cat.py:28:0: C0411: third party import "from construct import GreedyBytes, Switch, GreedyRange, FlagsEnum" should be placed before "from pySim.utils import b2h, h2b, dec_xplmn_w_act" (wrong-import-order) pySim/cat.py:23:0: W0611: Unused h2b imported from pySim.utils (unused-import) pySim/cat.py:26:0: W0611: Unused Bit imported from construct (unused-import) pySim/cat.py:26:0: W0611: Unused Flag imported from construct (unused-import) pySim/cat.py:27:0: W0611: Unused Tell imported from construct (unused-import) pySim/cat.py:27:0: W0611: Unused Padding imported from construct (unused-import) pySim/cat.py:27:0: W0611: Unused RepeatUntil imported from construct (unused-import) Change-Id: I0c6327a7a8045736e8678b7286a7ed685c96fb71 --- M pySim/cat.py 1 file changed, 39 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/18/35818/1 diff --git a/pySim/cat.py b/pySim/cat.py index 5925bf3..1dff194 100644 --- a/pySim/cat.py +++ b/pySim/cat.py @@ -18,14 +18,14 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -from bidict import bidict from typing import List -from pySim.utils import b2h, h2b, dec_xplmn_w_act +from bidict import bidict +from construct import Int8ub, Int16ub, Byte, Bytes, BitsInteger +from construct import Struct, Enum, BitStruct, this +from construct import GreedyBytes, Switch, GreedyRange, FlagsEnum from pySim.tlv import TLV_IE, COMPR_TLV_IE, BER_TLV_IE, TLV_IE_Collection from pySim.construct import PlmnAdapter, BcdAdapter, HexAdapter, GsmStringAdapter, TonNpi -from construct import Int8ub, Int16ub, Byte, Bytes, Bit, Flag, BitsInteger -from construct import Struct, Enum, Tell, BitStruct, this, Padding, RepeatUntil -from construct import GreedyBytes, Switch, GreedyRange, FlagsEnum +from pySim.utils import b2h, dec_xplmn_w_act # Tag values as per TS 101 220 Table 7.23 @@ -583,11 +583,11 @@ # TS 31.111 Section 8.90 class PlmnWactList(COMPR_TLV_IE, tag=0xF2): - def _from_bytes(self, x): + def _from_bytes(self, do: bytes): r = [] i = 0 - while i < len(x): - r.append(dec_xplmn_w_act(b2h(x[i:i+5]))) + while i < len(do): + r.append(dec_xplmn_w_act(b2h(do[i:i+5]))) i += 5 return r @@ -978,8 +978,8 @@ for c in self.children: if type(c).__name__ == 'CommandDetails': return c - else: - return None + else: + return None class ProactiveCommand(TLV_IE_Collection, nested=[Refresh, MoreTime, PollInterval, PollingOff, SetUpEventList, SetUpCall, @@ -997,7 +997,7 @@ more difficult than any normal TLV IE Collection, because the content of one of the IEs defines the definitions of all the other IEs. So we first need to find the CommandDetails, and then parse according to the command type indicated in that IE data.""" - def from_bytes(self, binary: bytes) -> List[TLV_IE]: + def from_bytes(self, binary: bytes, context: dict = {}) -> List[TLV_IE]: # do a first parse step to get the CommandDetails pcmd = ProactiveCommandBase() pcmd.from_tlv(binary) @@ -1007,7 +1007,7 @@ if cmd_type in self.members_by_tag: cls = self.members_by_tag[cmd_type] inst = cls() - dec, remainder = inst.from_tlv(binary) + _dec, remainder = inst.from_tlv(binary) self.decoded = inst else: self.decoded = pcmd @@ -1019,7 +1019,7 @@ def to_dict(self): return self.decoded.to_dict() - def to_bytes(self): + def to_bytes(self, context: dict = {}): return self.decoded.to_tlv() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35818?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: I0c6327a7a8045736e8678b7286a7ed685c96fb71 Gerrit-Change-Number: 35818 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

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

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35817?usp=email ) Change subject: pylint: app.py ...................................................................... pylint: app.py pySim/app.py:113:0: C0305: Trailing newlines (trailing-newlines) pySim/app.py:23:0: W0611: Unused NoCardError imported from pySim.exceptions (unused-import) Change-Id: I3cac6892f4d3da66f116cecd49f751da227528a4 --- M pySim/app.py 1 file changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/17/35817/1 diff --git a/pySim/app.py b/pySim/app.py index 43ef06d..e3878b8 100644 --- a/pySim/app.py +++ b/pySim/app.py @@ -20,7 +20,6 @@ from pySim.commands import SimCardCommands from pySim.filesystem import CardModel, CardApplication from pySim.cards import card_detect, SimCardBase, UiccCardBase -from pySim.exceptions import NoCardError from pySim.runtime import RuntimeState from pySim.profile import CardProfile from pySim.cdma_ruim import CardProfileRUIM @@ -108,6 +107,3 @@ sl.set_sw_interpreter(rs) return rs, card - - - -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35817?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: I3cac6892f4d3da66f116cecd49f751da227528a4 Gerrit-Change-Number: 35817 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

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

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35819?usp=email ) Change subject: pylint: gsm_r.py ...................................................................... pylint: gsm_r.py pySim/gsm_r.py:97:0: W0311: Bad indentation. Found 11 spaces, expected 12 (bad-indentation) pySim/gsm_r.py:32:0: C0411: standard import "from struct import pack, unpack" should be placed before "from pySim.utils import *" (wrong-import-order) pySim/gsm_r.py:33:0: C0411: third party import "from construct import Struct, Bytes, Int8ub, Int16ub, Int24ub, Int32ub, FlagsEnum" should be placed before "from pySim.utils import *" (wrong-import-order) pySim/gsm_r.py:34:0: C0411: third party import "from construct import Optional as COptional" should be placed before "from pySim.utils import *" (wrong-import-order) pySim/gsm_r.py:35:0: C0412: Imports from package pySim are not grouped (ungrouped-imports) pySim/gsm_r.py:30:0: W0611: Unused import enum (unused-import) pySim/gsm_r.py:32:0: W0611: Unused pack imported from struct (unused-import) pySim/gsm_r.py:32:0: W0611: Unused unpack imported from struct (unused-import) pySim/gsm_r.py:39:0: W0611: Unused import pySim.ts_51_011 (unused-import) Change-Id: I2a3bba5994d0d4d90fcd3f51bee962fec3a8b0dc --- M pySim/gsm_r.py 1 file changed, 46 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/19/35819/1 diff --git a/pySim/gsm_r.py b/pySim/gsm_r.py index db7819c..14dbb2d 100644 --- a/pySim/gsm_r.py +++ b/pySim/gsm_r.py @@ -1,13 +1,10 @@ -# -*- coding: utf-8 -*- - -# without this, pylint will fail when inner classes are used -# within the 'nested' kwarg of our TlvMeta metaclass on python 3.7 :( -# pylint: disable=undefined-variable - """ The File (and its derived classes) uses the classes of pySim.filesystem in order to describe the files specified in UIC Reference P38 T 9001 5.0 "FFFIS for GSM-R SIM Cards" """ +# without this, pylint will fail when inner classes are used +# within the 'nested' kwarg of our TlvMeta metaclass on python 3.7 :( +# pylint: disable=undefined-variable # # Copyright (C) 2021 Harald Welte <laforge(a)osmocom.org> @@ -28,16 +25,13 @@ from pySim.utils import * -#from pySim.tlv import * from struct import pack, unpack -from construct import * +from construct import Struct, Bytes, Int8ub, Int16ub, Int24ub, Int32ub, FlagsEnum from construct import Optional as COptional -from pySim.construct import * -import enum +from pySim.construct import * from pySim.profile import CardProfileAddon from pySim.filesystem import * -import pySim.ts_51_011 ###################################################################### # DF.EIRENE (FFFIS for GSM-R SIM Cards) @@ -77,15 +71,15 @@ num = int(obj) & 0x7 if num == 0: return 'None' - elif num == 1: + if num == 1: return 4 - elif num == 2: + if num == 2: return 3 - elif num == 3: + if num == 3: return 2 - elif num == 4: + if num == 4: return 1 - elif num == 5: + if num == 5: return 0 def _encode(self, obj, context, path): @@ -94,13 +88,13 @@ obj = int(obj) if obj == 4: return 1 - elif obj == 3: + if obj == 3: return 2 - elif obj == 2: + if obj == 2: return 3 - elif obj == 1: + if obj == 1: return 4 - elif obj == 0: + if obj == 0: return 5 @@ -111,19 +105,19 @@ num = int(obj) & 0x7 if num == 0: return 'None' - elif num == 1: + if num == 1: return 4 - elif num == 2: + if num == 2: return 3 - elif num == 3: + if num == 3: return 2 - elif num == 4: + if num == 4: return 1 - elif num == 5: + if num == 5: return 0 - elif num == 6: + if num == 6: return 'B' - elif num == 7: + if num == 7: return 'A' def _encode(self, obj, context, path): @@ -131,17 +125,17 @@ return 0 if obj == 4: return 1 - elif obj == 3: + if obj == 3: return 2 - elif obj == 2: + if obj == 2: return 3 - elif obj == 1: + if obj == 1: return 4 - elif obj == 0: + if obj == 0: return 5 - elif obj == 'B': + if obj == 'B': return 6 - elif obj == 'A': + if obj == 'A': return 7 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35819?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: I2a3bba5994d0d4d90fcd3f51bee962fec3a8b0dc Gerrit-Change-Number: 35819 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: pylint: transport/calypso.py
by laforge 05 Feb '24

05 Feb '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35820?usp=email ) Change subject: pylint: transport/calypso.py ...................................................................... pylint: transport/calypso.py pySim/transport/calypso.py:27:0: W0401: Wildcard import pySim.exceptions (wildcard-import) pySim/transport/calypso.py:61:23: W0622: Redefining built-in 'type' (redefined-builtin) pySim/transport/calypso.py:62:8: R1725: Consider using Python 3 style super() without arguments (super-with-arguments) pySim/transport/calypso.py:73:8: R1725: Consider using Python 3 style super() without arguments (super-with-arguments) pySim/transport/calypso.py:27:0: W0614: Unused import(s) NoCardError and SwMatchError from wildcard import of pySim.exceptions (unused-wildcard-import) Change-Id: I6b10d5f3370c00b07288300b537c6f0e17c84a87 --- M pySim/transport/calypso.py 1 file changed, 20 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/20/35820/1 diff --git a/pySim/transport/calypso.py b/pySim/transport/calypso.py index 7544d2e..6252137 100644 --- a/pySim/transport/calypso.py +++ b/pySim/transport/calypso.py @@ -24,7 +24,7 @@ from typing import Optional from pySim.transport import LinkBase -from pySim.exceptions import * +from pySim.exceptions import ReaderError, ProtocolError from pySim.utils import h2b, b2h, Hexstr, ResTuple @@ -58,9 +58,9 @@ L1CTL_RES_T_FULL = 0x01 L1CTL_RES_T_SCHED = 0x02 - def __init__(self, type=L1CTL_RES_T_FULL): - super(L1CTLMessageReset, self).__init__(self.L1CTL_RESET_REQ) - self.data += struct.pack("Bxxx", type) + def __init__(self, ttype=L1CTL_RES_T_FULL): + super().__init__(self.L1CTL_RESET_REQ) + self.data += struct.pack("Bxxx", ttype) class L1CTLMessageSIM(L1CTLMessage): @@ -70,7 +70,7 @@ L1CTL_SIM_CONF = 0x17 def __init__(self, pdu): - super(L1CTLMessageSIM, self).__init__(self.L1CTL_SIM_REQ) + super().__init__(self.L1CTL_SIM_REQ) self.data += pdu -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35820?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: I6b10d5f3370c00b07288300b537c6f0e17c84a87 Gerrit-Change-Number: 35820 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log