<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/23581">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">filesystem: fix various issues found by mypy<br><br>Change-Id: Ib4de80451614712bdf5377a3a5b86156008e2c42<br>---<br>M pySim/filesystem.py<br>M pySim/utils.py<br>2 files changed, 30 insertions(+), 26 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/81/23581/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/filesystem.py b/pySim/filesystem.py</span><br><span>index 1c2a886..be0aaf6 100644</span><br><span>--- a/pySim/filesystem.py</span><br><span>+++ b/pySim/filesystem.py</span><br><span>@@ -31,7 +31,7 @@</span><br><span> from cmd2 import CommandSet, with_default_category, with_argparser</span><br><span> import argparse</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from typing import Optional, Iterable, List, Any</span><br><span style="color: hsl(120, 100%, 40%);">+from typing import cast, Optional, Iterable, List, Any, Dict, Tuple</span><br><span> </span><br><span> from pySim.utils import sw_match, h2b, b2h, is_hex</span><br><span> from pySim.exceptions import *</span><br><span>@@ -82,17 +82,19 @@</span><br><span> else:</span><br><span> return self.fid</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def fully_qualified_path(self, prefer_name:bool=True):</span><br><span style="color: hsl(120, 100%, 40%);">+ def fully_qualified_path(self, prefer_name:bool=True) -> List[str]:</span><br><span> """Return fully qualified path to file as list of FID or name strings.</span><br><span> </span><br><span> Args:</span><br><span> prefer_name : Preferably build path of names; fall-back to FIDs as required</span><br><span> """</span><br><span style="color: hsl(0, 100%, 40%);">- if self.parent != self:</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.parent and self.parent != self:</span><br><span> ret = self.parent.fully_qualified_path(prefer_name)</span><br><span> else:</span><br><span> ret = []</span><br><span style="color: hsl(0, 100%, 40%);">- ret.append(self._path_element(prefer_name))</span><br><span style="color: hsl(120, 100%, 40%);">+ elem = self._path_element(prefer_name)</span><br><span style="color: hsl(120, 100%, 40%);">+ if elem:</span><br><span style="color: hsl(120, 100%, 40%);">+ ret.append(elem)</span><br><span> return ret</span><br><span> </span><br><span> def get_mf(self) -> Optional['CardMF']:</span><br><span>@@ -101,11 +103,11 @@</span><br><span> return None</span><br><span> # iterate towards the top. MF has parent == self</span><br><span> node = self</span><br><span style="color: hsl(0, 100%, 40%);">- while node.parent != node:</span><br><span style="color: hsl(120, 100%, 40%);">+ while node.parent and node.parent != node:</span><br><span> node = node.parent</span><br><span style="color: hsl(0, 100%, 40%);">- return node</span><br><span style="color: hsl(120, 100%, 40%);">+ return cast(CardMF, node)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def _get_self_selectables(self, alias:str=None, flags = []) -> dict:</span><br><span style="color: hsl(120, 100%, 40%);">+ def _get_self_selectables(self, alias:str=None, flags = []) -> Dict[str, 'CardFile']:</span><br><span> """Return a dict of {'identifier': self} tuples.</span><br><span> </span><br><span> Args:</span><br><span>@@ -124,7 +126,7 @@</span><br><span> sels.update({self.name: self})</span><br><span> return sels</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def get_selectables(self, flags = []) -> dict:</span><br><span style="color: hsl(120, 100%, 40%);">+ def get_selectables(self, flags = []) -> Dict[str, 'CardFile']:</span><br><span> """Return a dict of {'identifier': File} that is selectable from the current file.</span><br><span> </span><br><span> Args:</span><br><span>@@ -140,7 +142,8 @@</span><br><span> sels = self._get_self_selectables('.', flags)</span><br><span> # we can always select our parent</span><br><span> if flags == [] or 'PARENT' in flags:</span><br><span style="color: hsl(0, 100%, 40%);">- sels = self.parent._get_self_selectables('..', flags)</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.parent:</span><br><span style="color: hsl(120, 100%, 40%);">+ sels = self.parent._get_self_selectables('..', flags)</span><br><span> # if we have a MF, we can always select its applications</span><br><span> if flags == [] or 'MF' in flags:</span><br><span> mf = self.get_mf()</span><br><span>@@ -149,22 +152,22 @@</span><br><span> sels.update(mf.get_app_selectables(flags = flags))</span><br><span> return sels</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def get_selectable_names(self, flags = []) -> dict:</span><br><span style="color: hsl(120, 100%, 40%);">+ def get_selectable_names(self, flags = []) -> List[str]:</span><br><span> """Return a dict of {'identifier': File} that is selectable from the current file.</span><br><span> </span><br><span> Args:</span><br><span> flags : Specify which selectables to return 'FIDS' and/or 'NAMES';</span><br><span> If not specified, all selectables will be returned.</span><br><span> Returns:</span><br><span style="color: hsl(0, 100%, 40%);">- dict containing all selectable items. Key is identifier (string), value</span><br><span style="color: hsl(0, 100%, 40%);">- a reference to a CardFile (or derived class) instance.</span><br><span style="color: hsl(120, 100%, 40%);">+ list containing all selectable names.</span><br><span> """</span><br><span> sels = self.get_selectables(flags)</span><br><span style="color: hsl(0, 100%, 40%);">- return sels.keys()</span><br><span style="color: hsl(120, 100%, 40%);">+ return list(sels.keys())</span><br><span> </span><br><span> def decode_select_response(self, data_hex:str):</span><br><span> """Decode the response to a SELECT command."""</span><br><span style="color: hsl(0, 100%, 40%);">- return self.parent.decode_select_response(data_hex)</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.parent:</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.parent.decode_select_response(data_hex)</span><br><span> </span><br><span> </span><br><span> class CardDF(CardFile):</span><br><span>@@ -241,7 +244,7 @@</span><br><span> sels.update({x.name: x for x in self.children.values() if x.name})</span><br><span> return sels</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def lookup_file_by_name(self, name:str) -> Optional[CardFile]:</span><br><span style="color: hsl(120, 100%, 40%);">+ def lookup_file_by_name(self, name:Optional[str]) -> Optional[CardFile]:</span><br><span> """Find a file with given name within current DF."""</span><br><span> if name == None:</span><br><span> return None</span><br><span>@@ -250,12 +253,12 @@</span><br><span> return i</span><br><span> return None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def lookup_file_by_sfid(self, sfid:str) -> Optional[CardFile]:</span><br><span style="color: hsl(120, 100%, 40%);">+ def lookup_file_by_sfid(self, sfid:Optional[str]) -> Optional[CardFile]:</span><br><span> """Find a file with given short file ID within current DF."""</span><br><span> if sfid == None:</span><br><span> return None</span><br><span> for i in self.children.values():</span><br><span style="color: hsl(0, 100%, 40%);">- if i.sfid == int(sfid):</span><br><span style="color: hsl(120, 100%, 40%);">+ if i.sfid == int(str(sfid)):</span><br><span> return i</span><br><span> return None</span><br><span> </span><br><span>@@ -332,8 +335,9 @@</span><br><span> def __init__(self, aid:str, **kwargs):</span><br><span> super().__init__(**kwargs)</span><br><span> self.aid = aid # Application Identifier</span><br><span style="color: hsl(0, 100%, 40%);">- if self.parent:</span><br><span style="color: hsl(0, 100%, 40%);">- self.parent.add_application(self)</span><br><span style="color: hsl(120, 100%, 40%);">+ mf = self.get_mf()</span><br><span style="color: hsl(120, 100%, 40%);">+ if mf:</span><br><span style="color: hsl(120, 100%, 40%);">+ mf.add_application(self)</span><br><span> </span><br><span> def __str__(self):</span><br><span> return "ADF(%s)" % (self.aid)</span><br><span>@@ -644,7 +648,7 @@</span><br><span> method = getattr(self, '_encode_record_bin', None)</span><br><span> if callable(method):</span><br><span> raw_bin_data = method(abstract_data)</span><br><span style="color: hsl(0, 100%, 40%);">- return h2b(raw_bin_data)</span><br><span style="color: hsl(120, 100%, 40%);">+ return b2h(raw_bin_data)</span><br><span> raise NotImplementedError</span><br><span> </span><br><span> def encode_record_bin(self, abstract_data:dict) -> bytearray:</span><br><span>@@ -683,8 +687,8 @@</span><br><span> We add a special class for those, so the user only has to provide encoder/decoder functions</span><br><span> for a record, while this class takes care of split / merge of records.</span><br><span> """</span><br><span style="color: hsl(0, 100%, 40%);">- def __init__(self, fid:str, sfid:str=None, name:str=None, desc:str=None,</span><br><span style="color: hsl(0, 100%, 40%);">- parent:Optional[CardDF]=None, rec_len:int=None, size={1,None}):</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, fid:str, rec_len:int, sfid:str=None, name:str=None, desc:str=None,</span><br><span style="color: hsl(120, 100%, 40%);">+ parent:Optional[CardDF]=None, size={1,None}):</span><br><span> """</span><br><span> Args:</span><br><span> fid : File Identifier (4 hex digits)</span><br><span>@@ -757,7 +761,7 @@</span><br><span> return method(abstract_data)</span><br><span> method = getattr(self, '_encode_record_bin', None)</span><br><span> if callable(method):</span><br><span style="color: hsl(0, 100%, 40%);">- return h2b(method(abstract_data))</span><br><span style="color: hsl(120, 100%, 40%);">+ return b2h(method(abstract_data))</span><br><span> raise NotImplementedError</span><br><span> </span><br><span> def encode_record_bin(self, abstract_data:dict) -> bytearray:</span><br><span>@@ -1040,8 +1044,8 @@</span><br><span> rec_nr : Record number to read</span><br><span> data_hex : Abstract data to be written</span><br><span> """</span><br><span style="color: hsl(0, 100%, 40%);">- hex_data = self.selected_file.encode_record_hex(data)</span><br><span style="color: hsl(0, 100%, 40%);">- return self.update_record(self, rec_nr, data_hex)</span><br><span style="color: hsl(120, 100%, 40%);">+ data_hex = self.selected_file.encode_record_hex(data)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.update_record(rec_nr, data_hex)</span><br><span> </span><br><span> </span><br><span> </span><br><span>diff --git a/pySim/utils.py b/pySim/utils.py</span><br><span>index 607526c..75106d8 100644</span><br><span>--- a/pySim/utils.py</span><br><span>+++ b/pySim/utils.py</span><br><span>@@ -803,7 +803,7 @@</span><br><span> </span><br><span> return None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def sw_match(sw:str, pattern:str) -> str:</span><br><span style="color: hsl(120, 100%, 40%);">+def sw_match(sw:str, pattern:str) -> bool:</span><br><span> """Match given SW against given pattern."""</span><br><span> # Create a masked version of the returned status word</span><br><span> sw_lower = sw.lower()</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/23581">change 23581</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/pysim/+/23581"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib4de80451614712bdf5377a3a5b86156008e2c42 </div>
<div style="display:none"> Gerrit-Change-Number: 23581 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>