laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35809?usp=email )

Change subject: pylint: card_key_provider.py, card_handler.py, iso7816_4.py, jsonpath.py ......................................................................

pylint: card_key_provider.py, card_handler.py, iso7816_4.py, jsonpath.py

pySim/card_key_provider.py:57:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) pySim/card_key_provider.py:61:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens)

pySim/card_handler.py:100:0: C0325: Unnecessary parens after '=' keyword (superfluous-parens) pySim/card_handler.py:100:24: C0121: Comparison 'self.cmds.get('verbose') == True' should be 'self.cmds.get('verbose') is True' if checking for the singleton value True, or 'bool(self.cmds.get('verbose'))' if testing for truthiness (singleton-comparison) pySim/card_handler.py:29:0: C0411: standard import "import subprocess" should be placed before "from pySim.transport import LinkBase" (wrong-import-order) pySim/card_handler.py:30:0: C0411: standard import "import sys" should be placed before "from pySim.transport import LinkBase" (wrong-import-order) pySim/card_handler.py:31:0: C0411: third party import "import yaml" should be placed before "from pySim.transport import LinkBase" (wrong-import-order)

pySim/iso7816_4.py:20:0: W0401: Wildcard import construct (wildcard-import)

pySim/jsonpath.py:1:0: C0114: Missing module docstring (missing-module-docstring) pySim/jsonpath.py:6:0: W0105: String statement has no effect (pointless-string-statement) pySim/jsonpath.py:2:0: W0611: Unused import json (unused-import) pySim/jsonpath.py:3:0: W0611: Unused import pprint (unused-import)

Change-Id: I780595d69000f727ad0fbaff4b89918b91b3122e --- M pySim/card_handler.py M pySim/card_key_provider.py M pySim/iso7816_4.py M pySim/jsonpath.py 4 files changed, 32 insertions(+), 11 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/09/35809/1

diff --git a/pySim/card_handler.py b/pySim/card_handler.py index 57e0d32..e7884ad 100644 --- a/pySim/card_handler.py +++ b/pySim/card_handler.py @@ -24,12 +24,11 @@ # along with this program. If not, see http://www.gnu.org/licenses/. #

-from pySim.transport import LinkBase - import subprocess import sys import yaml

+from pySim.transport import LinkBase

class CardHandlerBase: """Abstract base class representing a mechanism for card insertion/removal.""" @@ -97,7 +96,7 @@ print("Card handler Config-file: " + str(config_file)) with open(config_file) as cfg: self.cmds = yaml.load(cfg, Loader=yaml.FullLoader) - self.verbose = (self.cmds.get('verbose') == True) + self.verbose = self.cmds.get('verbose') is True

def __print_outout(self, out): print("") diff --git a/pySim/card_key_provider.py b/pySim/card_key_provider.py index 00e32aa..33a2a3d 100644 --- a/pySim/card_key_provider.py +++ b/pySim/card_key_provider.py @@ -54,11 +54,11 @@ dictionary of {field, value} strings for each requested field from 'fields' """ for f in fields: - if (f not in self.VALID_FIELD_NAMES): + if f not in self.VALID_FIELD_NAMES: raise ValueError("Requested field name '%s' is not a valid field name, valid field names are: %s" % (f, str(self.VALID_FIELD_NAMES)))

- if (key not in self.VALID_FIELD_NAMES): + if key not in self.VALID_FIELD_NAMES: raise ValueError("Key field name '%s' is not a valid field name, valid field names are: %s" % (key, str(self.VALID_FIELD_NAMES)))

diff --git a/pySim/iso7816_4.py b/pySim/iso7816_4.py index 1da5809..9d1229e 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 * +from construct import GreedyBytes from pySim.construct import * from pySim.utils import * from pySim.filesystem import * diff --git a/pySim/jsonpath.py b/pySim/jsonpath.py index 4dd838c..5778de9 100644 --- a/pySim/jsonpath.py +++ b/pySim/jsonpath.py @@ -1,8 +1,3 @@ -# coding=utf-8 -import json -import pprint -import jsonpath_ng - """JSONpath utility functions as needed within pysim.

As pySim-sell has the ability to represent SIM files as JSON strings, @@ -10,6 +5,8 @@ of a file or record in its JSON representation. """

+import jsonpath_ng + # (C) 2021 by Harald Welte laforge@osmocom.org # # This program is free software: you can redistribute it and/or modify