<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/26277">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">profile: decode_select_response use object instead 'Any'<br><br>the return type of decode_select_response is 'Any', lets be more<br>specific and use 'object'<br><br>Change-Id: Ic5c7ace234bc94ab1381d87e091369ade8011cab<br>---<br>M pySim/filesystem.py<br>M pySim/profile.py<br>M pySim/ts_102_221.py<br>M pySim/ts_51_011.py<br>4 files changed, 5 insertions(+), 6 deletions(-)<br><br></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 6b20db5..4c3308c 100644</span><br><span>--- a/pySim/filesystem.py</span><br><span>+++ b/pySim/filesystem.py</span><br><span>@@ -34,7 +34,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 cast, Optional, Iterable, List, Any, Dict, Tuple</span><br><span style="color: hsl(120, 100%, 40%);">+from typing import cast, Optional, Iterable, List, Dict, Tuple</span><br><span> </span><br><span> from smartcard.util import toBytes</span><br><span> </span><br><span>@@ -354,7 +354,7 @@</span><br><span> sels.update({x.name: x for x in self.applications.values() if x.name})</span><br><span> return sels</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def decode_select_response(self, data_hex:str) -> Any:</span><br><span style="color: hsl(120, 100%, 40%);">+ def decode_select_response(self, data_hex:str) -> object:</span><br><span> """Decode the response to a SELECT command.</span><br><span> </span><br><span> This is the fall-back method which automatically defers to the standard decoding</span><br><span>diff --git a/pySim/profile.py b/pySim/profile.py</span><br><span>index 768064f..8f3e986 100644</span><br><span>--- a/pySim/profile.py</span><br><span>+++ b/pySim/profile.py</span><br><span>@@ -24,7 +24,6 @@</span><br><span> from pySim.commands import SimCardCommands</span><br><span> from pySim.filesystem import CardApplication, interpret_sw</span><br><span> from pySim.utils import all_subclasses</span><br><span style="color: hsl(0, 100%, 40%);">-from typing import Any</span><br><span> import abc</span><br><span> import operator</span><br><span> </span><br><span>@@ -107,7 +106,7 @@</span><br><span> return interpret_sw(self.sw, sw)</span><br><span> </span><br><span> @staticmethod</span><br><span style="color: hsl(0, 100%, 40%);">- def decode_select_response(data_hex:str) -> Any:</span><br><span style="color: hsl(120, 100%, 40%);">+ def decode_select_response(data_hex:str) -> object:</span><br><span> """Decode the response to a SELECT command.</span><br><span> </span><br><span> This is the fall-back method which doesn't perform any decoding. It mostly</span><br><span>diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py</span><br><span>index 1d10988..adb40c1 100644</span><br><span>--- a/pySim/ts_102_221.py</span><br><span>+++ b/pySim/ts_102_221.py</span><br><span>@@ -673,7 +673,7 @@</span><br><span> super().__init__(name, desc='ETSI TS 102 221', cla="00", sel_ctrl="0004", files_in_mf=files, sw=sw)</span><br><span> </span><br><span> @staticmethod</span><br><span style="color: hsl(0, 100%, 40%);">- def decode_select_response(resp_hex:str) -> Any:</span><br><span style="color: hsl(120, 100%, 40%);">+ def decode_select_response(resp_hex:str) -> object:</span><br><span> """ETSI TS 102 221 Section 11.1.1.3"""</span><br><span> fixup_fcp_proprietary_tlv_map(FCP_Proprietary_TLV_MAP)</span><br><span> resp_hex = resp_hex.upper()</span><br><span>diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py</span><br><span>index f330460..847ed98 100644</span><br><span>--- a/pySim/ts_51_011.py</span><br><span>+++ b/pySim/ts_51_011.py</span><br><span>@@ -979,7 +979,7 @@</span><br><span> super().__init__('SIM', desc='GSM SIM Card', cla="a0", sel_ctrl="0000", files_in_mf=[DF_TELECOM(), DF_GSM()], sw=sw)</span><br><span> </span><br><span> @staticmethod</span><br><span style="color: hsl(0, 100%, 40%);">- def decode_select_response(resp_hex:str) -> Any:</span><br><span style="color: hsl(120, 100%, 40%);">+ def decode_select_response(resp_hex:str) -> object:</span><br><span> resp_bin = h2b(resp_hex)</span><br><span> struct_of_file_map = {</span><br><span> 0: 'transparent',</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/26277">change 26277</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/+/26277"/><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: Ic5c7ace234bc94ab1381d87e091369ade8011cab </div>
<div style="display:none"> Gerrit-Change-Number: 26277 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>