dexter has uploaded this change for review.
runtime: rename get_file_for_selectable to get_file_for_filename
Let's rename get_file_for_selectable to get_file_for_filename so that it
is immediately clear what the method does.
Related: OS#6092
Change-Id: Ifed860814229857ad8b969e50849debbf5d8918f
---
M pySim/runtime.py
M pySim/ts_102_222.py
2 files changed, 18 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/09/37609/1
diff --git a/pySim/runtime.py b/pySim/runtime.py
index 5a93645..a56d884 100644
--- a/pySim/runtime.py
+++ b/pySim/runtime.py
@@ -401,7 +401,7 @@
(data, _sw) = self.scc.status()
return self.selected_file.decode_select_response(data)
- def get_file_for_selectable(self, name: str):
+ def get_file_for_filename(self, name: str):
"""Get the related CardFile object for a specified filename."""
sels = self.selected_file.get_selectables()
return sels[name]
diff --git a/pySim/ts_102_222.py b/pySim/ts_102_222.py
index 4834ce8..7c47fd5 100644
--- a/pySim/ts_102_222.py
+++ b/pySim/ts_102_222.py
@@ -44,7 +44,7 @@
if not opts.force_delete:
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)
+ f = self._cmd.lchan.get_file_for_filename(opts.NAME)
(_data, _sw) = self._cmd.lchan.scc.delete_file(f.fid)
def complete_delete_file(self, text, line, begidx, endidx) -> List[str]:
@@ -65,7 +65,7 @@
if not opts.force:
self._cmd.perror("Refusing to terminate the file, please read the help text.")
return
- f = self._cmd.lchan.get_file_for_selectable(opts.NAME)
+ f = self._cmd.lchan.get_file_for_filename(opts.NAME)
(_data, _sw) = self._cmd.lchan.scc.terminate_df(f.fid)
def complete_terminate_df(self, text, line, begidx, endidx) -> List[str]:
@@ -81,7 +81,7 @@
if not opts.force:
self._cmd.perror("Refusing to terminate the file, please read the help text.")
return
- f = self._cmd.lchan.get_file_for_selectable(opts.NAME)
+ f = self._cmd.lchan.get_file_for_filename(opts.NAME)
(_data, _sw) = self._cmd.lchan.scc.terminate_ef(f.fid)
def complete_terminate_ef(self, text, line, begidx, endidx) -> List[str]:
@@ -209,7 +209,7 @@
@cmd2.with_argparser(resize_ef_parser)
def do_resize_ef(self, opts):
"""Resize an existing EF below the currently selected DF. Requires related privileges."""
- f = self._cmd.lchan.get_file_for_selectable(opts.NAME)
+ f = self._cmd.lchan.get_file_for_filename(opts.NAME)
ies = [FileIdentifier(decoded=f.fid),
FileSize(decoded=opts.file_size)]
fcp = FcpTemplate(children=ies)
To view, visit change 37609. To unsubscribe, or for help writing mail filters, visit settings.