laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/41836?usp=email )

Change subject: Fix esim.saip.ProfileElementSequence.remove_naas_of_type ......................................................................

Fix esim.saip.ProfileElementSequence.remove_naas_of_type

This method did not work at all at the moment, likely due to API churn over time. This change makes the following exception go away:

Traceback (most recent call last): File "projects/git/pysim/contrib/saip-tool.py", line 473, in <module> do_remove_naa(pes, opts) ~~~~~~~~~~~~~^^^^^^^^^^^ File "projects/git/pysim/contrib/saip-tool.py", line 203, in do_remove_naa pes.remove_naas_of_type(naa) ~~~~~~~~~~~~~~~~~~~~~~~^^^^^ File "projects/git/pysim/contrib/pySim/esim/saip/__init__.py", line 1748, in remove_naas_of_type if template in hdr.decoded['eUICC-Mandatory-GFSTEList']: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "projects/git/pysim/contrib/pySim/esim/saip/oid.py", line 48, in __eq__ return (self.intlist == other.intlist) ^^^^^^^^^^^^^ AttributeError: 'str' object has no attribute 'intlist'

A subsequent patch should introduce unit tests to avoid such breakage in the future.

Change-Id: I88d862d751198c3d1648ab7f11d6e6a8fdbc41c9 --- M pySim/esim/saip/__init__.py 1 file changed, 1 insertion(+), 2 deletions(-)

Approvals: dexter: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved

diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 5ca87aa..6b6c01c 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -1751,8 +1751,7 @@ del hdr.decoded['eUICC-Mandatory-services'][service] # remove any associated mandatory filesystem templates for template in naa.templates: - if template in hdr.decoded['eUICC-Mandatory-GFSTEList']: - hdr.decoded['eUICC-Mandatory-GFSTEList'] = [x for x in hdr.decoded['eUICC-Mandatory-GFSTEList'] if not template.prefix_match(x)] + hdr.decoded['eUICC-Mandatory-GFSTEList'] = [x for x in hdr.decoded['eUICC-Mandatory-GFSTEList'] if not template.prefix_match(x)] # determine the ADF names (AIDs) of all NAA ADFs naa_adf_names = [] if naa.pe_types[0] in self.pe_by_type: