laforge has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/48/35848/1 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: 1 Gerrit-Owner: laforge <[email protected]> Gerrit-MessageType: newchange
