laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35839?usp=email )
Change subject: pylint: sysmocom_sja2.py ...................................................................... pylint: sysmocom_sja2.py pySim/sysmocom_sja2.py:20:0: W0401: Wildcard import pytlv.TLV (wildcard-import) pySim/sysmocom_sja2.py:27:0: W0401: Wildcard import construct (wildcard-import) pySim/sysmocom_sja2.py:21:0: C0411: standard import "from struct import pack, unpack" should be placed before "from pytlv.TLV import *" (wrong-import-order) pySim/sysmocom_sja2.py:27:0: C0411: third party import "from construct import *" should be placed before "from pySim.utils import *" (wrong-import-order) pySim/sysmocom_sja2.py:21:0: W0611: Unused pack imported from struct (unused-import) pySim/sysmocom_sja2.py:25:0: W0611: Unused CardProfileUICC imported from pySim.ts_102_221 (unused-import) Change-Id: I0e5b5c6f3179f9710464af4cba91d682412b8a09 --- M pySim/sysmocom_sja2.py 1 file changed, 22 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py index 5bec446..eb53520 100644 --- a/pySim/sysmocom_sja2.py +++ b/pySim/sysmocom_sja2.py @@ -17,14 +17,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. """ -from pytlv.TLV import * -from struct import pack, unpack +from struct import unpack +from construct import FlagsEnum, Byte, Struct, Int8ub, Bytes, Mapping, Enum, Padding, BitsInteger +from construct import Bit, this, Int32ub, Int16ub, Nibble, BytesInteger, GreedyRange +from construct import Optional as COptional + from pySim.utils import * from pySim.filesystem import * from pySim.runtime import RuntimeState -from pySim.ts_102_221 import CardProfileUICC from pySim.construct import * -from construct import * import pySim key_type2str = { @@ -70,7 +71,7 @@ 'attempts_remaining'/Int8ub, 'maximum_attempts'/Int8ub, 'pin'/HexAdapter(Rpad(Bytes(8))), - 'puk'/Optional(PukStruct)) + 'puk'/COptional(PukStruct)) class EF_MILENAGE_CFG(TransparentEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35839?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: I0e5b5c6f3179f9710464af4cba91d682412b8a09 Gerrit-Change-Number: 35839 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <[email protected]> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <[email protected]> Gerrit-MessageType: merged
